You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2017/04/03 16:49:34 UTC
[01/50] airavata git commit: Merge branch 'pga_update' of
https://github.com/ECoulter/airavata into develop
Repository: airavata
Updated Branches:
refs/heads/master 9526e99b2 -> 5100c07db
Merge branch 'pga_update' of https://github.com/ECoulter/airavata into develop
This closes #100
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2071c7c2
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2071c7c2
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2071c7c2
Branch: refs/heads/master
Commit: 2071c7c25cdf16e3a28540b8c2edd859f3a21596
Parents: 7da786f d7764ad
Author: Marcus Christie <ma...@apache.org>
Authored: Wed Mar 8 10:13:43 2017 -0500
Committer: Marcus Christie <ma...@apache.org>
Committed: Wed Mar 8 10:13:43 2017 -0500
----------------------------------------------------------------------
dev-tools/ansible/README.md | 1 +
dev-tools/ansible/group_vars/all.yml | 5 +-
.../ansible/roles/env_setup/tasks/main.yml | 10 +-
dev-tools/ansible/roles/pga/handlers/main.yml | 4 +-
.../roles/pga/tasks/install_deps_CentOS_7.yml | 33 +++
.../roles/pga/tasks/install_deps_Ubuntu_14.yml | 48 ++++
.../roles/pga/tasks/install_deps_Ubuntu_16.yml | 61 +++++
dev-tools/ansible/roles/pga/tasks/main.yml | 86 ++-----
.../ansible/roles/pga/templates/apache2.conf.j2 | 222 +++++++++++++++++++
dev-tools/ansible/roles/pga/vars/main.yml | 7 +-
10 files changed, 409 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/2071c7c2/dev-tools/ansible/group_vars/all.yml
----------------------------------------------------------------------
diff --cc dev-tools/ansible/group_vars/all.yml
index 534ac6a,8a6e545..534db86
--- a/dev-tools/ansible/group_vars/all.yml
+++ b/dev-tools/ansible/group_vars/all.yml
@@@ -1,8 -1,8 +1,8 @@@
---
ansible_connection: ssh
-# ansible_ssh_user: centos
-ansible_ssh_user: root
+# ansible_user: centos
+ansible_user: root
- ansible_ssh_private_key_file: /Users/supun/Desktop/shameera-key.pem
+ #ansible_ssh_private_key_file: /Users/supun/Desktop/shameera-key.pem
# ansible_ssh_private_key_file: /Users/syodage/Projects/airavata-ansible/shameera-aws.pem.txt
user: centos
[29/50] airavata git commit: merging remote branch
Posted by sm...@apache.org.
merging remote branch
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/45edb673
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/45edb673
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/45edb673
Branch: refs/heads/master
Commit: 45edb67374b6e9d3265d26ee9536670d3d4e52bf
Parents: 7e1d369 8ac8e9e
Author: scnakandala <su...@gmail.com>
Authored: Mon Mar 20 23:32:58 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Mar 20 23:32:58 2017 -0400
----------------------------------------------------------------------
dev-tools/ansible/airavata.yml | 8 --
.../testing-0.17-scigap/group_vars/all/vars.yml | 91 ++++++++++++++++++++
.../group_vars/all/vault.yml | 7 ++
.../testing-0.17-scigap/group_vars/pga/vars.yml | 32 +++++++
.../group_vars/pga/vault.yml | 18 ++++
.../inventories/testing-0.17-scigap/hosts | 23 +++++
.../group_vars/all/vars.yml | 91 ++++++++++++++++++++
.../group_vars/all/vault.yml | 7 ++
.../group_vars/pga/vars.yml | 32 +++++++
.../group_vars/pga/vault.yml | 18 ++++
.../inventories/testing-0.17-testdrive/hosts | 23 +++++
.../inventories/testing-0.17/group_vars/all.yml | 91 --------------------
.../testing-0.17/group_vars/all/vars.yml | 91 ++++++++++++++++++++
.../testing-0.17/group_vars/all/vault.yml | 7 ++
.../testing-0.17/group_vars/pga/vars.yml | 3 +-
.../ansible/inventories/testing-0.17/hosts | 2 +-
.../roles/pga/tasks/install_deps_CentOS_6.yml | 33 -------
.../gfac/core/context/ProcessContext.java | 38 +++++---
.../DeltaScripts/appCatalog_schema_delta.sql | 64 ++++++++++++++
.../credentialStore_schema_delta.sql | 17 ++++
.../DeltaScripts/expCatalog_schema_delta.sql | 34 ++++++++
.../replicaCatalog_schema_delta.sql | 12 +++
.../DeltaScripts/workFlow_schema_delta.sql | 11 +++
.../0.16-0.17/migration-notes.md | 10 +++
24 files changed, 614 insertions(+), 149 deletions(-)
----------------------------------------------------------------------
[28/50] airavata git commit: adding capability to search based on the
shared_count
Posted by sm...@apache.org.
adding capability to search based on the shared_count
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7e1d3695
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7e1d3695
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7e1d3695
Branch: refs/heads/master
Commit: 7e1d36953ae5f756ded7158460a278f0211d90ce
Parents: 0c8c2ae
Author: scnakandala <su...@gmail.com>
Authored: Mon Mar 20 23:31:39 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Mar 20 23:31:39 2017 -0400
----------------------------------------------------------------------
.../db/repositories/EntityRepository.java | 6 ++++
.../registry/SharingRegistryServiceTest.java | 13 ++++++--
.../sharing/registry/models/Entity.java | 32 +++++++++++++++-----
.../registry/models/EntitySearchField.java | 6 +++-
.../registry/models/SearchCondition.java | 4 +--
.../api-docs/sharing_models.html | 11 +++++--
.../thrift_models/sharing_models.thrift | 8 +++--
7 files changed, 63 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7e1d3695/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
index 504a75b..15ac97a 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
@@ -121,6 +121,12 @@ public class EntityRepository extends AbstractRepository<Entity, EntityEntity, E
}else{
query += "E.UPDATED_TIME <= " + Integer.parseInt(searchCriteria.getValue().trim()) + " AND ";
}
+ } else if (searchCriteria.getSearchField().equals(EntitySearchField.SHARED_COUNT)) {
+ if (searchCriteria.getSearchCondition().equals(SearchCondition.GTE)) {
+ query += "E.SHARED_COUNT >= " + Integer.parseInt(searchCriteria.getValue().trim()) + " AND ";
+ } else {
+ query += "E.SHARED_COUNT <= " + Integer.parseInt(searchCriteria.getValue().trim()) + " AND ";
+ }
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/7e1d3695/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java b/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java
index 15a84c6..a8c177a 100644
--- a/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java
+++ b/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java
@@ -281,6 +281,15 @@ public class SharingRegistryServiceTest {
Assert.assertTrue(sharingServiceClient.getEntity(domainId, "test-project-1").getSharedCount() == 0);
sharingServiceClient.shareEntityWithUsers(domainId, "test-project-1", Arrays.asList("test-user-2"), "WRITE", true);
Assert.assertTrue(sharingServiceClient.getEntity(domainId, "test-project-1").getSharedCount() == 1);
+ ArrayList<SearchCriteria> filters = new ArrayList<>();
+ SearchCriteria searchCriteria = new SearchCriteria();
+ searchCriteria.setSearchField(EntitySearchField.SHARED_COUNT);
+ searchCriteria.setValue("1");
+ searchCriteria.setSearchCondition(SearchCondition.GTE);
+ filters.add(searchCriteria);
+ Assert.assertTrue(sharingServiceClient.searchEntities(domainId, "test-user-2", filters, 0, -1).size() == 1);
+
+
sharingServiceClient.revokeEntitySharingFromUsers(domainId, "test-project-1", Arrays.asList("test-user-2"), "WRITE");
Assert.assertTrue(sharingServiceClient.getEntity(domainId, "test-project-1").getSharedCount() == 0);
sharingServiceClient.shareEntityWithUsers(domainId, "test-project-1", Arrays.asList("test-user-2"), "WRITE", true);
@@ -312,8 +321,8 @@ public class SharingRegistryServiceTest {
//false
Assert.assertFalse((sharingServiceClient.userHasAccess(domainId, "test-user-3", "test-file-1", "CLONE")));
- ArrayList<SearchCriteria> filters = new ArrayList<>();
- SearchCriteria searchCriteria = new SearchCriteria();
+ filters = new ArrayList<>();
+ searchCriteria = new SearchCriteria();
searchCriteria.setSearchCondition(SearchCondition.FULL_TEXT);
searchCriteria.setValue("experiment");
searchCriteria.setSearchField(EntitySearchField.FULL_TEXT);
http://git-wip-us.apache.org/repos/asf/airavata/blob/7e1d3695/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java
index 36fa51e..4dd9aa2 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java
@@ -6,16 +6,34 @@
*/
package org.apache.airavata.sharing.registry.models;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
-import org.apache.thrift.scheme.TupleScheme;
-import javax.annotation.Generated;
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
import java.nio.ByteBuffer;
-import java.util.*;
+import java.util.Arrays;
+import javax.annotation.Generated;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
@@ -673,7 +691,7 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
if (value == null) {
unsetSharedCount();
} else {
- setSharedCount((Integer) value);
+ setSharedCount((Integer)value);
}
break;
@@ -681,7 +699,7 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
if (value == null) {
unsetOriginalEntityCreationTime();
} else {
- setOriginalEntityCreationTime((Long) value);
+ setOriginalEntityCreationTime((Long)value);
}
break;
http://git-wip-us.apache.org/repos/asf/airavata/blob/7e1d3695/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntitySearchField.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntitySearchField.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntitySearchField.java
index 91d245f..2486d4f 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntitySearchField.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntitySearchField.java
@@ -20,6 +20,7 @@ import org.apache.thrift.TEnum;
* <li>OWNER_ID : Owner of the entity</li>
* <li>CREATED_TIME : Created time of the entity</li>
* <li>UPDATED_TIME : Updated time of the entity</li>
+ * <li>SHARED_COUNT : Number of directly shared users and groups</li>
*
*/
public enum EntitySearchField implements org.apache.thrift.TEnum {
@@ -31,7 +32,8 @@ public enum EntitySearchField implements org.apache.thrift.TEnum {
PERMISSION_TYPE_ID(5),
CREATED_TIME(6),
UPDATED_TIME(7),
- ENTITY_TYPE_ID(8);
+ ENTITY_TYPE_ID(8),
+ SHARED_COUNT(9);
private final int value;
@@ -70,6 +72,8 @@ public enum EntitySearchField implements org.apache.thrift.TEnum {
return UPDATED_TIME;
case 8:
return ENTITY_TYPE_ID;
+ case 9:
+ return SHARED_COUNT;
default:
return null;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/7e1d3695/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SearchCondition.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SearchCondition.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SearchCondition.java
index cd65078..bdeb721 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SearchCondition.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SearchCondition.java
@@ -16,8 +16,8 @@ import org.apache.thrift.TEnum;
* <li>EQUAL : Simply matches for equality. Applicable for name, and parent entity id</li>
* <li>LIKE : Check for the condition %$FIELD% condition. Applicable for name, and description</li>
* <li>FULL_TEXT : Does a full text search. Only applicable for the FULL_TEXT field.</li>
- * <li>GTE : Greater than or equal. Only applicable for created time and updated time.</li>
- * <li>LTE : Less than or equal. Only applicable for created time and updated time.</li>
+ * <li>GTE : Greater than or equal. Only applicable for created time, updated time and shared count.</li>
+ * <li>LTE : Less than or equal. Only applicable for created time, updated time and shared count.</li>
*
*/
public enum SearchCondition implements org.apache.thrift.TEnum {
http://git-wip-us.apache.org/repos/asf/airavata/blob/7e1d3695/modules/sharing-registry/sharing-service-docs/api-docs/sharing_models.html
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-service-docs/api-docs/sharing_models.html b/modules/sharing-registry/sharing-service-docs/api-docs/sharing_models.html
index e49d79e..3937299 100644
--- a/modules/sharing-registry/sharing-service-docs/api-docs/sharing_models.html
+++ b/modules/sharing-registry/sharing-service-docs/api-docs/sharing_models.html
@@ -70,6 +70,7 @@ considered as a group in it's own right for implementation ease</p>
<li>OWNER_ID : Owner of the entity</li>
<li>CREATED_TIME : Created time of the entity</li>
<li>UPDATED_TIME : Updated time of the entity</li>
+ <li>SHARED_COUNT : Number of directly shared users and groups</li>
<br/><br/><table class="table-bordered table-striped table-condensed">
<tr><td><code>NAME</code></td><td><code>0</code></td><td>
@@ -94,14 +95,20 @@ considered as a group in it's own right for implementation ease</p>
<td>
</td>
</tr>
+ <tr>
+ <td><code>SHARED_COUNT</code></td>
+ <td><code>9</code></td>
+ <td>
+ </td>
+ </tr>
</table></div>
<div class="definition"><h3 id="Enum_SearchCondition">Enumeration: SearchCondition</h3>
<p>Different search operators that can be used with the entity search fields</p>
<li>EQUAL : Simply matches for equality. Applicable for name, and parent entity id</li>
<li>LIKE : Check for the condition %$FIELD% condition. Applicable for name, and description</li>
<li>FULL_TEXT : Does a full text search. Only applicable for the FULL_TEXT field.</li>
-<li>GTE : Greater than or equal. Only applicable for created time and updated time.</li>
-<li>LTE : Less than or equal. Only applicable for created time and updated time.</li>
+ <li>GTE : Greater than or equal. Only applicable for created time, updated time and shared count.</li>
+ <li>LTE : Less than or equal. Only applicable for created time, updated time and shared count.</li>
<br/><br/><table class="table-bordered table-striped table-condensed">
<tr><td><code>EQUAL</code></td><td><code>0</code></td><td>
http://git-wip-us.apache.org/repos/asf/airavata/blob/7e1d3695/modules/sharing-registry/thrift_models/sharing_models.thrift
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/thrift_models/sharing_models.thrift b/modules/sharing-registry/thrift_models/sharing_models.thrift
index 977a1fd..50518e1 100644
--- a/modules/sharing-registry/thrift_models/sharing_models.thrift
+++ b/modules/sharing-registry/thrift_models/sharing_models.thrift
@@ -154,6 +154,7 @@ struct EntityType {
* <li>OWNER_ID : Owner of the entity</li>
* <li>CREATED_TIME : Created time of the entity</li>
* <li>UPDATED_TIME : Updated time of the entity</li>
+* <li>SHARED_COUNT : Number of directly shared users and groups</li>
**/
enum EntitySearchField {
NAME,
@@ -164,7 +165,8 @@ enum EntitySearchField {
PERMISSION_TYPE_ID,
CREATED_TIME,
UPDATED_TIME,
- ENTITY_TYPE_ID
+ ENTITY_TYPE_ID,
+ SHARED_COUNT
}
/**
@@ -172,8 +174,8 @@ enum EntitySearchField {
* <li>EQUAL : Simply matches for equality. Applicable for name, and parent entity id</li>
* <li>LIKE : Check for the condition %$FIELD% condition. Applicable for name, and description</li>
* <li>FULL_TEXT : Does a full text search. Only applicable for the FULL_TEXT field.</li>
-* <li>GTE : Greater than or equal. Only applicable for created time and updated time.</li>
-* <li>LTE : Less than or equal. Only applicable for created time and updated time.</li>
+* <li>GTE : Greater than or equal. Only applicable for created time, updated time and shared count.</li>
+* <li>LTE : Less than or equal. Only applicable for created time, updated time and shared count.</li>
**/
enum SearchCondition {
EQUAL,
[46/50] airavata git commit: AIRAVATA-2350 Including GATEWAY_ID in
user resource profile keys
Posted by sm...@apache.org.
AIRAVATA-2350 Including GATEWAY_ID in user resource profile keys
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/98ebc2c3
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/98ebc2c3
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/98ebc2c3
Branch: refs/heads/master
Commit: 98ebc2c35b7e48ea1d63c25a42cf3c530c607144
Parents: 6bc536f
Author: Marcus Christie <ma...@apache.org>
Authored: Wed Mar 29 11:58:01 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Wed Mar 29 11:58:46 2017 -0400
----------------------------------------------------------------------
.../catalog/impl/UsrResourceProfileImpl.java | 4 ++--
.../model/UserComputeResourcePreference.java | 1 +
.../model/UserComputeResourcePreferencePK.java | 24 ++++++++++++++++----
.../catalog/model/UserStoragePreference.java | 1 +
.../catalog/model/UserStoragePreferencePK.java | 22 +++++++++++++++---
.../UserComputeHostPreferenceResource.java | 10 +++++---
.../UserStoragePreferenceResource.java | 14 ++++++++----
.../registry/cpi/CompositeIdentifier.java | 12 +++++++++-
.../DeltaScripts/appCatalog_schema_delta.sql | 6 ++---
9 files changed, 73 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/98ebc2c3/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/UsrResourceProfileImpl.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/UsrResourceProfileImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/UsrResourceProfileImpl.java
index bb4cc0b..98c1af7 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/UsrResourceProfileImpl.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/UsrResourceProfileImpl.java
@@ -205,7 +205,7 @@ public class UsrResourceProfileImpl implements UsrResourceProfile {
public boolean removeUserComputeResourcePreferenceFromGateway(String userId, String gatewayId, String preferenceId) throws AppCatalogException {
try {
UserComputeHostPreferenceResource resource = new UserComputeHostPreferenceResource();
- CompositeIdentifier ids = new CompositeIdentifier(preferenceId, userId);
+ CompositeIdentifier ids = new CompositeIdentifier(preferenceId, userId, gatewayId);
resource.remove(ids);
return true;
}catch (Exception e) {
@@ -218,7 +218,7 @@ public class UsrResourceProfileImpl implements UsrResourceProfile {
public boolean removeUserDataStoragePreferenceFromGateway(String userId, String gatewayId, String preferenceId) throws AppCatalogException {
try {
UserStoragePreferenceResource resource = new UserStoragePreferenceResource();
- CompositeIdentifier ids = new CompositeIdentifier(preferenceId,userId);
+ CompositeIdentifier ids = new CompositeIdentifier(preferenceId,userId, gatewayId);
resource.remove(ids);
return true;
}catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/98ebc2c3/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/UserComputeResourcePreference.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/UserComputeResourcePreference.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/UserComputeResourcePreference.java
index 05f6e7c..599793a 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/UserComputeResourcePreference.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/UserComputeResourcePreference.java
@@ -35,6 +35,7 @@ public class UserComputeResourcePreference {
@Id
@Column(name = "RESOURCE_ID")
private String resourceId;
+ @Id
@Column(name = "GATEWAY_ID")
private String gatewayID;
@Column(name = "PREFERED_BATCH_QUEUE")
http://git-wip-us.apache.org/repos/asf/airavata/blob/98ebc2c3/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/UserComputeResourcePreferencePK.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/UserComputeResourcePreferencePK.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/UserComputeResourcePreferencePK.java
index 0192f79..fbb7dd7 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/UserComputeResourcePreferencePK.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/UserComputeResourcePreferencePK.java
@@ -24,11 +24,13 @@ package org.apache.airavata.registry.core.app.catalog.model;
import java.io.Serializable;
public class UserComputeResourcePreferencePK implements Serializable {
- private String resourceId;
private String userId;
+ private String gatewayID;
+ private String resourceId;
- public UserComputeResourcePreferencePK(String userId, String resourceId) {
+ public UserComputeResourcePreferencePK(String userId, String gatewayID, String resourceId) {
this.userId = userId;
+ this.gatewayID = gatewayID;
this.resourceId = resourceId;
}
@@ -37,12 +39,22 @@ public class UserComputeResourcePreferencePK implements Serializable {
@Override
public boolean equals(Object o) {
- return false;
+ if (this == o) return true;
+ if (!(o instanceof UserComputeResourcePreferencePK)) return false;
+
+ UserComputeResourcePreferencePK that = (UserComputeResourcePreferencePK) o;
+
+ if (!userId.equals(that.userId)) return false;
+ if (!gatewayID.equals(that.gatewayID)) return false;
+ return resourceId.equals(that.resourceId);
}
@Override
public int hashCode() {
- return 1;
+ int result = userId.hashCode();
+ result = 31 * result + gatewayID.hashCode();
+ result = 31 * result + resourceId.hashCode();
+ return result;
}
public String getUserId() {
@@ -60,4 +72,8 @@ public class UserComputeResourcePreferencePK implements Serializable {
public void setResourceId(String resourceId) {
this.resourceId = resourceId;
}
+
+ public String getGatewayID() { return gatewayID; }
+
+ public void setGatewayID(String gatewayID) { this.gatewayID = gatewayID; }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/98ebc2c3/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/UserStoragePreference.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/UserStoragePreference.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/UserStoragePreference.java
index 3efbd7b..9b96d9f 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/UserStoragePreference.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/UserStoragePreference.java
@@ -31,6 +31,7 @@ public class UserStoragePreference {
@Id
@Column(name = "USER_ID")
private String userId;
+ @Id
@Column(name = "GATEWAY_ID")
private String gatewayID;
@Id
http://git-wip-us.apache.org/repos/asf/airavata/blob/98ebc2c3/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/UserStoragePreferencePK.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/UserStoragePreferencePK.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/UserStoragePreferencePK.java
index 7943b5a..9fdbe6a 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/UserStoragePreferencePK.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/UserStoragePreferencePK.java
@@ -26,10 +26,12 @@ import java.io.Serializable;
public class UserStoragePreferencePK implements Serializable {
private String userId;
+ private String gatewayID;
private String storageResourceId;
- public UserStoragePreferencePK(String userId, String storageResourceId) {
+ public UserStoragePreferencePK(String userId, String gatewayID, String storageResourceId) {
this.userId = userId;
+ this.gatewayID = gatewayID;
this.storageResourceId = storageResourceId;
}
@@ -38,12 +40,22 @@ public class UserStoragePreferencePK implements Serializable {
@Override
public boolean equals(Object o) {
- return false;
+ if (this == o) return true;
+ if (!(o instanceof UserStoragePreferencePK)) return false;
+
+ UserStoragePreferencePK that = (UserStoragePreferencePK) o;
+
+ if (!userId.equals(that.userId)) return false;
+ if (!gatewayID.equals(that.gatewayID)) return false;
+ return storageResourceId.equals(that.storageResourceId);
}
@Override
public int hashCode() {
- return 1;
+ int result = userId.hashCode();
+ result = 31 * result + gatewayID.hashCode();
+ result = 31 * result + storageResourceId.hashCode();
+ return result;
}
public String getUserId() {
@@ -61,4 +73,8 @@ public class UserStoragePreferencePK implements Serializable {
public void setStorageResourceId(String storageResourceId) {
this.storageResourceId = storageResourceId;
}
+
+ public String getGatewayID() { return gatewayID; }
+
+ public void setGatewayID(String gatewayID) { this.gatewayID = gatewayID; }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/98ebc2c3/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/UserComputeHostPreferenceResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/UserComputeHostPreferenceResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/UserComputeHostPreferenceResource.java
index 1dcbe9d..cbcf603 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/UserComputeHostPreferenceResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/UserComputeHostPreferenceResource.java
@@ -185,6 +185,7 @@ public class UserComputeHostPreferenceResource extends AppCatAbstractResource {
AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(USER_COMPUTE_RESOURCE_PREFERENCE);
generator.setParameter(UserComputeResourcePreferenceConstants.RESOURCE_ID, ids.getTopLevelIdentifier().toString());
generator.setParameter(UserComputeResourcePreferenceConstants.USER_ID, ids.getSecondLevelIdentifier().toString());
+ generator.setParameter(UserComputeResourcePreferenceConstants.GATEWAY_ID, ids.getThirdLevelIdentifier().toString());
Query q = generator.deleteQuery(em);
q.executeUpdate();
@@ -225,6 +226,7 @@ public class UserComputeHostPreferenceResource extends AppCatAbstractResource {
AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(USER_COMPUTE_RESOURCE_PREFERENCE);
generator.setParameter(UserComputeResourcePreferenceConstants.RESOURCE_ID, ids.getTopLevelIdentifier().toString());
generator.setParameter(UserComputeResourcePreferenceConstants.USER_ID, ids.getSecondLevelIdentifier().toString());
+ generator.setParameter(UserComputeResourcePreferenceConstants.GATEWAY_ID, ids.getThirdLevelIdentifier().toString());
Query q = generator.selectQuery(em);
UserComputeResourcePreference preference = (UserComputeResourcePreference) q.getSingleResult();
UserComputeHostPreferenceResource preferenceResource =
@@ -351,7 +353,7 @@ public class UserComputeHostPreferenceResource extends AppCatAbstractResource {
EntityManager em = null;
try {
em = AppCatalogJPAUtils.getEntityManager();
- UserComputeResourcePreference existingPreference = em.find(UserComputeResourcePreference.class, new UserComputeResourcePreferencePK(userId, resourceId));
+ UserComputeResourcePreference existingPreference = em.find(UserComputeResourcePreference.class, new UserComputeResourcePreferencePK(userId, gatewayID, resourceId));
if (em.isOpen()) {
if (em.getTransaction().isActive()){
em.getTransaction().rollback();
@@ -429,9 +431,11 @@ public class UserComputeHostPreferenceResource extends AppCatAbstractResource {
EntityManager em = null;
try {
em = AppCatalogJPAUtils.getEntityManager();
+ String resourceId = ids.getTopLevelIdentifier().toString();
+ String userId = ids.getSecondLevelIdentifier().toString();
+ String gatewayId = ids.getThirdLevelIdentifier().toString();
UserComputeResourcePreference existingPreference = em.find(UserComputeResourcePreference.class,
- new UserComputeResourcePreferencePK(ids.getTopLevelIdentifier().toString(),
- ids.getSecondLevelIdentifier().toString()));
+ new UserComputeResourcePreferencePK(userId, gatewayId, resourceId));
if (em.isOpen()) {
if (em.getTransaction().isActive()){
em.getTransaction().rollback();
http://git-wip-us.apache.org/repos/asf/airavata/blob/98ebc2c3/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/UserStoragePreferenceResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/UserStoragePreferenceResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/UserStoragePreferenceResource.java
index 34852ae..2eb9c2b 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/UserStoragePreferenceResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/UserStoragePreferenceResource.java
@@ -124,6 +124,7 @@ public class UserStoragePreferenceResource extends AppCatAbstractResource {
AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(USER_STORAGE_PREFERENCE);
generator.setParameter(UserStoragePreferenceConstants.STORAGE_ID, ids.getTopLevelIdentifier().toString());
generator.setParameter(UserStoragePreferenceConstants.USER_ID, ids.getSecondLevelIdentifier().toString());
+ generator.setParameter(UserStoragePreferenceConstants.GATEWAY_ID, ids.getThirdLevelIdentifier().toString());
Query q = generator.deleteQuery(em);
q.executeUpdate();
@@ -162,8 +163,9 @@ public class UserStoragePreferenceResource extends AppCatAbstractResource {
em = AppCatalogJPAUtils.getEntityManager();
em.getTransaction().begin();
AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(USER_STORAGE_PREFERENCE);
- generator.setParameter(UserStoragePreferenceConstants.USER_ID, ids.getTopLevelIdentifier().toString());
- generator.setParameter(UserStoragePreferenceConstants.STORAGE_ID, ids.getSecondLevelIdentifier().toString());
+ generator.setParameter(UserStoragePreferenceConstants.STORAGE_ID, ids.getTopLevelIdentifier().toString());
+ generator.setParameter(UserStoragePreferenceConstants.USER_ID, ids.getSecondLevelIdentifier().toString());
+ generator.setParameter(UserStoragePreferenceConstants.GATEWAY_ID, ids.getThirdLevelIdentifier().toString());
Query q = generator.selectQuery(em);
UserStoragePreference preference = (UserStoragePreference) q.getSingleResult();
UserStoragePreferenceResource preferenceResource =
@@ -290,7 +292,7 @@ public class UserStoragePreferenceResource extends AppCatAbstractResource {
EntityManager em = null;
try {
em = AppCatalogJPAUtils.getEntityManager();
- UserStoragePreference existingPreference = em.find(UserStoragePreference.class, new UserStoragePreferencePK(userId, storageResourceId));
+ UserStoragePreference existingPreference = em.find(UserStoragePreference.class, new UserStoragePreferencePK(userId, gatewayID, storageResourceId));
if (em.isOpen()) {
if (em.getTransaction().isActive()){
em.getTransaction().rollback();
@@ -354,9 +356,11 @@ public class UserStoragePreferenceResource extends AppCatAbstractResource {
EntityManager em = null;
try {
em = AppCatalogJPAUtils.getEntityManager();
+ String storageResourceId = ids.getTopLevelIdentifier().toString();
+ String userId = ids.getSecondLevelIdentifier().toString();
+ String gatewayID = ids.getThirdLevelIdentifier().toString();
UserStoragePreference existingPreference = em.find(UserStoragePreference.class,
- new UserStoragePreferencePK(ids.getTopLevelIdentifier().toString(),
- ids.getSecondLevelIdentifier().toString()));
+ new UserStoragePreferencePK(userId, gatewayID, storageResourceId));
if (em.isOpen()) {
if (em.getTransaction().isActive()){
em.getTransaction().rollback();
http://git-wip-us.apache.org/repos/asf/airavata/blob/98ebc2c3/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/CompositeIdentifier.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/CompositeIdentifier.java b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/CompositeIdentifier.java
index fee8aec..1e203ba 100644
--- a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/CompositeIdentifier.java
+++ b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/CompositeIdentifier.java
@@ -28,12 +28,18 @@ package org.apache.airavata.registry.cpi;
public class CompositeIdentifier {
private Object topLevelIdentifier;
private Object secondLevelIdentifier;
+ private Object thirdLevelIdentifier;
public CompositeIdentifier(Object topLevelIdentifier, Object secondLevelIdentifier) {
this.topLevelIdentifier = topLevelIdentifier;
this.secondLevelIdentifier = secondLevelIdentifier;
}
+ public CompositeIdentifier(Object topLevelIdentifier, Object secondLevelIdentifier, Object thirdLevelIdentifier) {
+ this(topLevelIdentifier, secondLevelIdentifier);
+ this.thirdLevelIdentifier = thirdLevelIdentifier;
+ }
+
public Object getTopLevelIdentifier() {
return topLevelIdentifier;
}
@@ -42,9 +48,13 @@ public class CompositeIdentifier {
return secondLevelIdentifier;
}
+ public Object getThirdLevelIdentifier() { return thirdLevelIdentifier; }
+
@Override
public String toString() {
- if (topLevelIdentifier instanceof String && secondLevelIdentifier instanceof String) {
+ if (thirdLevelIdentifier != null && thirdLevelIdentifier instanceof String && topLevelIdentifier instanceof String && secondLevelIdentifier instanceof String) {
+ return topLevelIdentifier + "," + secondLevelIdentifier + "," + thirdLevelIdentifier;
+ } else if (topLevelIdentifier instanceof String && secondLevelIdentifier instanceof String) {
return topLevelIdentifier + "," + secondLevelIdentifier;
}else if (topLevelIdentifier instanceof String ) {
return topLevelIdentifier.toString();
http://git-wip-us.apache.org/repos/asf/airavata/blob/98ebc2c3/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/appCatalog_schema_delta.sql
----------------------------------------------------------------------
diff --git a/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/appCatalog_schema_delta.sql b/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/appCatalog_schema_delta.sql
index e2f5dec..6832fdb 100644
--- a/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/appCatalog_schema_delta.sql
+++ b/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/appCatalog_schema_delta.sql
@@ -16,7 +16,7 @@ CREATE TABLE `USER_RESOURCE_PROFILE` (
`IDENTITY_SERVER_PWD_CRED_TOKEN` varchar(255) DEFAULT NULL,
`IDENTITY_SERVER_TENANT` varchar(255) DEFAULT NULL,
`UPDATE_TIME` datetime DEFAULT NULL,
- PRIMARY KEY (`USER_ID`)
+ PRIMARY KEY (`USER_ID`,`GATEWAY_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
CREATE TABLE `USER_STORAGE_PREFERENCE` (
`STORAGE_RESOURCE_ID` varchar(255) NOT NULL,
@@ -25,7 +25,7 @@ CREATE TABLE `USER_STORAGE_PREFERENCE` (
`FS_ROOT_LOCATION` varchar(255) DEFAULT NULL,
`GATEWAY_ID` varchar(255) DEFAULT NULL,
`LOGIN_USERNAME` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`STORAGE_RESOURCE_ID`,`USER_ID`)
+ PRIMARY KEY (`STORAGE_RESOURCE_ID`,`USER_ID`,`GATEWAY_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
CREATE TABLE `CLOUD_JOB_SUBMISSION` (
`JOB_SUBMISSION_INTERFACE_ID` varchar(255) NOT NULL,
@@ -49,7 +49,7 @@ CREATE TABLE `USER_COMPUTE_RESOURCE_PREFERENCE` (
`RESERVATION_END_TIME` datetime DEFAULT NULL,
`RESERVATION_START_TIME` datetime DEFAULT NULL,
`SCRATCH_LOCATION` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`RESOURCE_ID`,`USER_ID`)
+ PRIMARY KEY (`RESOURCE_ID`,`USER_ID`,`GATEWAY_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
ALTER TABLE `BATCH_QUEUE` ADD `DEFAULT_CPU_COUNT` int(11) DEFAULT NULL;
ALTER TABLE `BATCH_QUEUE` ADD `DEFAULT_NODE_COUNT` int(11) DEFAULT NULL;
[45/50] airavata git commit: checking bounds for experiment statuses
when updating an experiment
Posted by sm...@apache.org.
checking bounds for experiment statuses when updating an experiment
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6bc536f5
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6bc536f5
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6bc536f5
Branch: refs/heads/master
Commit: 6bc536f5915f8f95bd956fa50e9d3fb36a026892
Parents: 053df2f
Author: scnakandala <su...@gmail.com>
Authored: Tue Mar 28 14:02:26 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Tue Mar 28 14:02:26 2017 -0400
----------------------------------------------------------------------
.../core/experiment/catalog/impl/ExperimentRegistry.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/6bc536f5/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
index 58c6f9e..d0bd650 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
@@ -630,10 +630,14 @@ public class ExperimentRegistry {
if (experimentOutputs != null && !experimentOutputs.isEmpty()) {
updateExpOutputs(experimentOutputs, expId);
}
- ExperimentStatus experimentStatus = experiment.getExperimentStatus().get(0);
- if (experimentStatus != null) {
- updateExperimentStatus(experimentStatus, expId);
+
+ List<ExperimentStatus> experimentStatuses = experiment.getExperimentStatus();
+ if (experimentStatuses != null && experimentStatuses.size() > 0) {
+ if (experimentStatuses.get(0) != null) {
+ updateExperimentStatus(experimentStatuses.get(0), expId);
+ }
}
+
List<ErrorModel> errors = experiment.getErrors();
if (errors != null && !errors.isEmpty()) {
for (ErrorModel errror : errors) {
[26/50] airavata git commit: AIRAVATA-2335 Updating DB names, password
Posted by sm...@apache.org.
AIRAVATA-2335 Updating DB names, password
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7126b1fb
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7126b1fb
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7126b1fb
Branch: refs/heads/master
Commit: 7126b1fbbbd713f0814b39afc3e6912929f6850d
Parents: 2eb8f21
Author: Marcus Christie <ma...@apache.org>
Authored: Mon Mar 20 16:12:09 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Mon Mar 20 16:12:09 2017 -0400
----------------------------------------------------------------------
dev-tools/ansible/airavata.yml | 8 --------
.../inventories/testing-0.17/group_vars/all/vars.yml | 10 +++++-----
.../inventories/testing-0.17/group_vars/all/vault.yml | 12 ++++++------
3 files changed, 11 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7126b1fb/dev-tools/ansible/airavata.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/airavata.yml b/dev-tools/ansible/airavata.yml
index 6111871..4ab3576 100644
--- a/dev-tools/ansible/airavata.yml
+++ b/dev-tools/ansible/airavata.yml
@@ -12,14 +12,6 @@
- env_setup
- rabbitmq
-- hosts: database
- tags: mysql , airavata
- roles:
- - env_setup
- - role: database
- become: yes
- become_user: "{{user}}"
-
- hosts: gfac
tags: gfac, airavata
roles:
http://git-wip-us.apache.org/repos/asf/airavata/blob/7126b1fb/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vars.yml b/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vars.yml
index 408a77b..3229580 100644
--- a/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vars.yml
@@ -18,12 +18,12 @@ db_server: "{{ groups['database'][0] }}"
db_server_port: "3306"
db_user: "airavata"
db_password: "{{ vault_db_password }}"
-app_catalog: "app_catalog"
-exp_catalog: "exp_catalog"
-replica_catalog: "replica_catalog"
+app_catalog: "master_app_catalog"
+exp_catalog: "master_exp_catalog"
+replica_catalog: "master_replica_catalog"
sharing_catalog: "sharing_catalog"
-workflow_catalog: "wf_catalog"
-credential_store: "credential_store"
+workflow_catalog: "master_wf_catalog"
+credential_store: "master_credential_store"
mysql_connector_jar: "mysql-connector-java-5.1.37-bin.jar"
http://git-wip-us.apache.org/repos/asf/airavata/blob/7126b1fb/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 a1d18b5..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,7 +1,7 @@
$ANSIBLE_VAULT;1.1;AES256
-36666132643537623138323138316561383434336231643237303337623462313834323462656434
-6362663032643235363133613463616663643731316438340a636336316333386434303635303961
-64626364363465366538666538643037366431326533366562393765313631363434323230666665
-3230633265386131360a316232386666613664383561663231346466353065393435376537653631
-36663363353964336464653964393931346530343139313465303730316562613937636566623038
-3637393433373136343934313266653665346665323765373261
+65316665653761353134393035633263663062626565323337376434336262613962336165343434
+3232643663396464353466376433633439376566336463300a626665316339646633633435396136
+64333134363830336336363534373333353732376535343166633737383363646530376633363133
+3836303335373630340a376164653834663134653236613430373738373839646531343830626662
+61316261643065633866616133386332353863643562333038613839636433383866333834356433
+6132353361376633313032643464346464623161653663373862
[31/50] airavata git commit: check is exists before creating
Posted by sm...@apache.org.
check is exists before creating
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/38dc8974
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/38dc8974
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/38dc8974
Branch: refs/heads/master
Commit: 38dc8974edb9e5dd19aa6a9a9b04e02ffd3547a5
Parents: 45edb67
Author: scnakandala <su...@gmail.com>
Authored: Wed Mar 22 14:56:23 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Mar 22 14:56:23 2017 -0400
----------------------------------------------------------------------
.../migrator/airavata/AiravataDataMigrator.java | 29 +++++++++++++-------
1 file changed, 19 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/38dc8974/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java b/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java
index f69ffe6..d11abbf 100644
--- a/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java
+++ b/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java
@@ -37,7 +37,7 @@ public class AiravataDataMigrator {
public static void main(String[] args) throws SQLException, ClassNotFoundException, TException, ApplicationSettingsException {
Connection expCatConnection = ConnectionFactory.getInstance().getExpCatConnection();
- SharingRegistryServerHandler govRegistryServerHandler = new SharingRegistryServerHandler();
+ SharingRegistryServerHandler sharingRegistryServerHandler = new SharingRegistryServerHandler();
String query = "SELECT * FROM GATEWAY";
Statement statement = expCatConnection.createStatement();
@@ -50,7 +50,8 @@ public class AiravataDataMigrator {
domain.setName(rs.getString("GATEWAY_ID"));
domain.setDescription("Domain entry for " + domain.name);
- govRegistryServerHandler.createDomain(domain);
+ if (!sharingRegistryServerHandler.isDomainExists(domain.domainId))
+ sharingRegistryServerHandler.createDomain(domain);
//Creating Entity Types for each domain
EntityType entityType = new EntityType();
@@ -58,21 +59,24 @@ public class AiravataDataMigrator {
entityType.setDomainId(domain.domainId);
entityType.setName("PROJECT");
entityType.setDescription("Project entity type");
- govRegistryServerHandler.createEntityType(entityType);
+ if (!sharingRegistryServerHandler.isEntityTypeExists(entityType.domainId, entityType.entityTypeId))
+ sharingRegistryServerHandler.createEntityType(entityType);
entityType = new EntityType();
entityType.setEntityTypeId(domain.domainId+":EXPERIMENT");
entityType.setDomainId(domain.domainId);
entityType.setName("EXPERIMENT");
entityType.setDescription("Experiment entity type");
- govRegistryServerHandler.createEntityType(entityType);
+ if (!sharingRegistryServerHandler.isEntityTypeExists(entityType.domainId, entityType.entityTypeId))
+ sharingRegistryServerHandler.createEntityType(entityType);
entityType = new EntityType();
entityType.setEntityTypeId(domain.domainId+":FILE");
entityType.setDomainId(domain.domainId);
entityType.setName("FILE");
entityType.setDescription("File entity type");
- govRegistryServerHandler.createEntityType(entityType);
+ if (!sharingRegistryServerHandler.isEntityTypeExists(entityType.domainId, entityType.entityTypeId))
+ sharingRegistryServerHandler.createEntityType(entityType);
//Creating Permission Types for each domain
PermissionType permissionType = new PermissionType();
@@ -80,14 +84,16 @@ public class AiravataDataMigrator {
permissionType.setDomainId(domain.domainId);
permissionType.setName("READ");
permissionType.setDescription("Read permission type");
- govRegistryServerHandler.createPermissionType(permissionType);
+ if (!sharingRegistryServerHandler.isEntityTypeExists(entityType.domainId, entityType.entityTypeId))
+ sharingRegistryServerHandler.createPermissionType(permissionType);
permissionType = new PermissionType();
permissionType.setPermissionTypeId(domain.domainId+":WRITE");
permissionType.setDomainId(domain.domainId);
permissionType.setName("WRITE");
permissionType.setDescription("Write permission type");
- govRegistryServerHandler.createPermissionType(permissionType);
+ if (!sharingRegistryServerHandler.isEntityTypeExists(entityType.domainId, entityType.entityTypeId))
+ sharingRegistryServerHandler.createPermissionType(permissionType);
}catch (Exception ex){
ex.printStackTrace();
}
@@ -104,7 +110,8 @@ public class AiravataDataMigrator {
user.setDomainId(rs.getString("GATEWAY_ID"));
user.setUserName(rs.getString("USER_NAME"));
- govRegistryServerHandler.createUser(user);
+ if (!sharingRegistryServerHandler.isUserExists(user.domainId, user.userId))
+ sharingRegistryServerHandler.createUser(user);
}catch (Exception ex){
ex.printStackTrace();
}
@@ -131,7 +138,8 @@ public class AiravataDataMigrator {
Map<String, String> metadata = new HashMap<>();
metadata.put("CREATION_TIME", rs.getDate("CREATION_TIME").toString());
- govRegistryServerHandler.createEntity(entity);
+ if (!sharingRegistryServerHandler.isEntityExists(entity.domainId, entity.entityId))
+ sharingRegistryServerHandler.createEntity(entity);
}catch (Exception ex) {
ex.printStackTrace();
}
@@ -166,7 +174,8 @@ public class AiravataDataMigrator {
metadata.put("GATEWAY_INSTANCE_ID", rs.getString("GATEWAY_INSTANCE_ID"));
metadata.put("ARCHIVE", rs.getString("ARCHIVE"));
- govRegistryServerHandler.createEntity(entity);
+ if (!sharingRegistryServerHandler.isEntityExists(entity.domainId, entity.entityId))
+ sharingRegistryServerHandler.createEntity(entity);
}catch (Exception ex){
ex.printStackTrace();
}
[03/50] airavata git commit: AIRAVATA-2335 Reorganized inventories;
updates for deploying on Jetstream
Posted by sm...@apache.org.
AIRAVATA-2335 Reorganized inventories; updates for deploying on Jetstream
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/4b54ff60
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/4b54ff60
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/4b54ff60
Branch: refs/heads/master
Commit: 4b54ff605b46cdfc83f989dfde533a0fb2168821
Parents: 2071c7c
Author: Marcus Christie <ma...@apache.org>
Authored: Tue Mar 7 09:58:17 2017 -0500
Committer: Marcus Christie <ma...@apache.org>
Committed: Wed Mar 8 10:15:15 2017 -0500
----------------------------------------------------------------------
dev-tools/ansible/.gitignore | 1 +
dev-tools/ansible/airavata.yml | 47 ++++++++++
dev-tools/ansible/group_vars/.gitignore | 1 -
dev-tools/ansible/group_vars/all.yml | 94 --------------------
dev-tools/ansible/group_vars/dev-airavata.yml | 2 -
dev-tools/ansible/group_vars/dev-pga.yml | 3 -
dev-tools/ansible/group_vars/local.yml.template | 4 -
.../inventories/develop/group_vars/.gitignore | 1 +
.../inventories/develop/group_vars/all.yml | 94 ++++++++++++++++++++
.../develop/group_vars/dev-airavata.yml | 2 +
.../inventories/develop/group_vars/dev-pga.yml | 3 +
.../develop/group_vars/local.yml.template | 4 +
.../inventories/testing-0.17/group_vars/all.yml | 91 +++++++++++++++++++
.../ansible/inventories/testing-0.17/hosts | 20 +++++
.../ansible/roles/api-orch/defaults/main.yml | 1 +
.../templates/airavata-server.properties.j2 | 12 +++
.../database/files/MariaDB_yum_CentOS_7.repo | 7 ++
dev-tools/ansible/roles/database/tasks/main.yml | 12 ++-
dev-tools/ansible/roles/database/vars/main.yml | 6 +-
19 files changed, 298 insertions(+), 107 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/4b54ff60/dev-tools/ansible/.gitignore
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/.gitignore b/dev-tools/ansible/.gitignore
new file mode 100644
index 0000000..a8b42eb
--- /dev/null
+++ b/dev-tools/ansible/.gitignore
@@ -0,0 +1 @@
+*.retry
http://git-wip-us.apache.org/repos/asf/airavata/blob/4b54ff60/dev-tools/ansible/airavata.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/airavata.yml b/dev-tools/ansible/airavata.yml
new file mode 100644
index 0000000..6111871
--- /dev/null
+++ b/dev-tools/ansible/airavata.yml
@@ -0,0 +1,47 @@
+---
+- hosts: zookeeper
+ tags: zookeeper, airavata
+ roles:
+ - env_setup
+ - java
+ - zookeeper
+
+- hosts: rabbitmq
+ tags: rabbitmq, airavata
+ roles:
+ - env_setup
+ - rabbitmq
+
+- hosts: database
+ tags: mysql , airavata
+ roles:
+ - env_setup
+ - role: database
+ become: yes
+ become_user: "{{user}}"
+
+- hosts: gfac
+ tags: gfac, airavata
+ roles:
+ - env_setup
+ - java
+ - role: common
+ become: yes
+ become_user: "{{user}}"
+ - role: gfac
+ become: yes
+ become_user: "{{user}}"
+
+- hosts: api-orch
+ tags: api-orch, airavata
+ roles:
+ - env_setup
+ - java
+ - role: common
+ become: yes
+ become_user: "{{user}}"
+ - role: api-orch
+ become: yes
+ become_user: "{{user}}"
+
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/4b54ff60/dev-tools/ansible/group_vars/.gitignore
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/group_vars/.gitignore b/dev-tools/ansible/group_vars/.gitignore
deleted file mode 100644
index 20ebc05..0000000
--- a/dev-tools/ansible/group_vars/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-local.yml
http://git-wip-us.apache.org/repos/asf/airavata/blob/4b54ff60/dev-tools/ansible/group_vars/all.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/group_vars/all.yml b/dev-tools/ansible/group_vars/all.yml
deleted file mode 100644
index 534db86..0000000
--- a/dev-tools/ansible/group_vars/all.yml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-ansible_connection: ssh
-# ansible_user: centos
-ansible_user: root
-#ansible_ssh_private_key_file: /Users/supun/Desktop/shameera-key.pem
-# ansible_ssh_private_key_file: /Users/syodage/Projects/airavata-ansible/shameera-aws.pem.txt
-
-user: centos
-group: centos
-user_home: "/home/{{ user }}"
-
-# deployment related variables
-deployment_dir: "{{ user_home }}/dev-deployment"
-airavata_source_dir: "{{ user_home }}/source"
-airavata_repo: "https://git-wip-us.apache.org/repos/asf/airavata.git"
-airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
-airavata_dist_name: "{{ airavata_dist }}-bin.tar.gz"
-old_airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
-git_branch: develop
-
-# Database related variables
-db_server: "{{ groups['database'][0] }}"
-db_server_port: "3306"
-db_user: "airavata"
-db_password: "airavata"
-app_catalog: "app_catalog"
-exp_catalog: "exp_catalog"
-replica_catalog: "replica_catalog"
-sharing_catalog: "sharing_catalog"
-workflow_catalog: "wf_catalog"
-credential_store: "credential_store"
-
-mysql_connector_jar: "mysql-connector-java-5.1.37-bin.jar"
-
-# Rabbitmq related vareables
-rabbitmq_server: "{{ groups['rabbitmq'][0] }}"
-rabbitmq_vhost: "develop"
-rabbitmq_user: "airavata"
-rabbitmq_password: "airavata"
-rabbitmq_port: "5672"
-rabbitmq_broker_url: "amqp://{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ rabbitmq_server}}:{{ rabbitmq_port }}/{{ rabbitmq_vhost }}"
-
-# Zoookeeper related variables
-zookeeper_client_port: 2181
-zookeeper_url: "{{ groups['zookeeper'][0] }}:{{ zookeeper_client_port }}"
-# API Server related variables
-api_server_name: "apiserver-node0"
-api_server_host: "{{ansible_fqdn}}"
-api_server_port: "8930"
-api_secured: "false"
-tls_enable: "false"
-api_server_tls_port: "9930"
-enable_sharing: "true"
-
-# Orchestrator related variables
-orchestrator_name: "orchestrator-node0"
-orchestrator_host: "{{ansible_fqdn}}"
-orchestrator_port: "8940"
-api_orch_dir: "{{ deployment_dir }}/api-orchestrator"
-
-# registry related variables
-registry_name: regserver-node0
-registry_host: "{{groups['registry'][0]}}"
-registry_port: 8970
-registry_dir: "{{ deployment_dir }}/registry"
-default_gateway: "php_reference_gateway"
-
-# Credential and keystore related variables
-#authorization_server: "https://{{ groups['wso2is'][0]}}:9443/services/"
-authorization_server: "https://idp.scigap.org:9443/services/"
-keystore: "airavata.jks"
-keystore_passwd: "airavata"
-#client_truststore: "client_truststore.jks"
-client_truststore: "airavata.jks"
-client_truststore_passwd: "airavata"
-cred_keystore: "airavata_sym.jks"
-cred_keystore_passwd: "airavata"
-cred_keystore_alias: "airavata"
-cred_store_server_host: "{{ ansible_fqdn }}"
-cred_store_port: "8960"
-keystores_location: "{{ deployment_dir }}/keystores"
-
-# Gfac related variables
-gfac_name: "gfac-node0"
-gfac_host: "{{ ansible_fqdn }}"
-gfac_port: "8950"
-gfac_dir: "{{ deployment_dir }}/gfac-instance"
-
-# Monitoring variables
-monitor_email_address: "test.airavata@gmail.com"
-monitor_email_password: "airavata"
-
-# PGA variables
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
http://git-wip-us.apache.org/repos/asf/airavata/blob/4b54ff60/dev-tools/ansible/group_vars/dev-airavata.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/group_vars/dev-airavata.yml b/dev-tools/ansible/group_vars/dev-airavata.yml
deleted file mode 100644
index 06586ec..0000000
--- a/dev-tools/ansible/group_vars/dev-airavata.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-airavata_source_dir: "/home/airavata/dev-airavata-source"
-deployment_dir: "/home/airavata/dev-deployment"
http://git-wip-us.apache.org/repos/asf/airavata/blob/4b54ff60/dev-tools/ansible/group_vars/dev-pga.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/group_vars/dev-pga.yml b/dev-tools/ansible/group_vars/dev-pga.yml
deleted file mode 100644
index 7b82521..0000000
--- a/dev-tools/ansible/group_vars/dev-pga.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-portals_dir: /home/pga/portals
-git_branch: develop
-airavata_php_gateway_repo: https://git-wip-us.apache.org/repos/asf/airavata-php-gateway.git
http://git-wip-us.apache.org/repos/asf/airavata/blob/4b54ff60/dev-tools/ansible/group_vars/local.yml.template
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/group_vars/local.yml.template b/dev-tools/ansible/group_vars/local.yml.template
deleted file mode 100644
index d7ff4e9..0000000
--- a/dev-tools/ansible/group_vars/local.yml.template
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-airavata_source_dir: "/Users/machrist/Documents/Airavata/airavata"
-deployment_dir: "/Users/machrist/Documents/Airavata/LocalAiravata"
http://git-wip-us.apache.org/repos/asf/airavata/blob/4b54ff60/dev-tools/ansible/inventories/develop/group_vars/.gitignore
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/develop/group_vars/.gitignore b/dev-tools/ansible/inventories/develop/group_vars/.gitignore
new file mode 100644
index 0000000..20ebc05
--- /dev/null
+++ b/dev-tools/ansible/inventories/develop/group_vars/.gitignore
@@ -0,0 +1 @@
+local.yml
http://git-wip-us.apache.org/repos/asf/airavata/blob/4b54ff60/dev-tools/ansible/inventories/develop/group_vars/all.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/develop/group_vars/all.yml b/dev-tools/ansible/inventories/develop/group_vars/all.yml
new file mode 100644
index 0000000..534db86
--- /dev/null
+++ b/dev-tools/ansible/inventories/develop/group_vars/all.yml
@@ -0,0 +1,94 @@
+---
+ansible_connection: ssh
+# ansible_user: centos
+ansible_user: root
+#ansible_ssh_private_key_file: /Users/supun/Desktop/shameera-key.pem
+# ansible_ssh_private_key_file: /Users/syodage/Projects/airavata-ansible/shameera-aws.pem.txt
+
+user: centos
+group: centos
+user_home: "/home/{{ user }}"
+
+# deployment related variables
+deployment_dir: "{{ user_home }}/dev-deployment"
+airavata_source_dir: "{{ user_home }}/source"
+airavata_repo: "https://git-wip-us.apache.org/repos/asf/airavata.git"
+airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
+airavata_dist_name: "{{ airavata_dist }}-bin.tar.gz"
+old_airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
+git_branch: develop
+
+# Database related variables
+db_server: "{{ groups['database'][0] }}"
+db_server_port: "3306"
+db_user: "airavata"
+db_password: "airavata"
+app_catalog: "app_catalog"
+exp_catalog: "exp_catalog"
+replica_catalog: "replica_catalog"
+sharing_catalog: "sharing_catalog"
+workflow_catalog: "wf_catalog"
+credential_store: "credential_store"
+
+mysql_connector_jar: "mysql-connector-java-5.1.37-bin.jar"
+
+# Rabbitmq related vareables
+rabbitmq_server: "{{ groups['rabbitmq'][0] }}"
+rabbitmq_vhost: "develop"
+rabbitmq_user: "airavata"
+rabbitmq_password: "airavata"
+rabbitmq_port: "5672"
+rabbitmq_broker_url: "amqp://{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ rabbitmq_server}}:{{ rabbitmq_port }}/{{ rabbitmq_vhost }}"
+
+# Zoookeeper related variables
+zookeeper_client_port: 2181
+zookeeper_url: "{{ groups['zookeeper'][0] }}:{{ zookeeper_client_port }}"
+# API Server related variables
+api_server_name: "apiserver-node0"
+api_server_host: "{{ansible_fqdn}}"
+api_server_port: "8930"
+api_secured: "false"
+tls_enable: "false"
+api_server_tls_port: "9930"
+enable_sharing: "true"
+
+# Orchestrator related variables
+orchestrator_name: "orchestrator-node0"
+orchestrator_host: "{{ansible_fqdn}}"
+orchestrator_port: "8940"
+api_orch_dir: "{{ deployment_dir }}/api-orchestrator"
+
+# registry related variables
+registry_name: regserver-node0
+registry_host: "{{groups['registry'][0]}}"
+registry_port: 8970
+registry_dir: "{{ deployment_dir }}/registry"
+default_gateway: "php_reference_gateway"
+
+# Credential and keystore related variables
+#authorization_server: "https://{{ groups['wso2is'][0]}}:9443/services/"
+authorization_server: "https://idp.scigap.org:9443/services/"
+keystore: "airavata.jks"
+keystore_passwd: "airavata"
+#client_truststore: "client_truststore.jks"
+client_truststore: "airavata.jks"
+client_truststore_passwd: "airavata"
+cred_keystore: "airavata_sym.jks"
+cred_keystore_passwd: "airavata"
+cred_keystore_alias: "airavata"
+cred_store_server_host: "{{ ansible_fqdn }}"
+cred_store_port: "8960"
+keystores_location: "{{ deployment_dir }}/keystores"
+
+# Gfac related variables
+gfac_name: "gfac-node0"
+gfac_host: "{{ ansible_fqdn }}"
+gfac_port: "8950"
+gfac_dir: "{{ deployment_dir }}/gfac-instance"
+
+# Monitoring variables
+monitor_email_address: "test.airavata@gmail.com"
+monitor_email_password: "airavata"
+
+# PGA variables
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
http://git-wip-us.apache.org/repos/asf/airavata/blob/4b54ff60/dev-tools/ansible/inventories/develop/group_vars/dev-airavata.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/develop/group_vars/dev-airavata.yml b/dev-tools/ansible/inventories/develop/group_vars/dev-airavata.yml
new file mode 100644
index 0000000..06586ec
--- /dev/null
+++ b/dev-tools/ansible/inventories/develop/group_vars/dev-airavata.yml
@@ -0,0 +1,2 @@
+airavata_source_dir: "/home/airavata/dev-airavata-source"
+deployment_dir: "/home/airavata/dev-deployment"
http://git-wip-us.apache.org/repos/asf/airavata/blob/4b54ff60/dev-tools/ansible/inventories/develop/group_vars/dev-pga.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/develop/group_vars/dev-pga.yml b/dev-tools/ansible/inventories/develop/group_vars/dev-pga.yml
new file mode 100644
index 0000000..7b82521
--- /dev/null
+++ b/dev-tools/ansible/inventories/develop/group_vars/dev-pga.yml
@@ -0,0 +1,3 @@
+portals_dir: /home/pga/portals
+git_branch: develop
+airavata_php_gateway_repo: https://git-wip-us.apache.org/repos/asf/airavata-php-gateway.git
http://git-wip-us.apache.org/repos/asf/airavata/blob/4b54ff60/dev-tools/ansible/inventories/develop/group_vars/local.yml.template
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/develop/group_vars/local.yml.template b/dev-tools/ansible/inventories/develop/group_vars/local.yml.template
new file mode 100644
index 0000000..d7ff4e9
--- /dev/null
+++ b/dev-tools/ansible/inventories/develop/group_vars/local.yml.template
@@ -0,0 +1,4 @@
+---
+
+airavata_source_dir: "/Users/machrist/Documents/Airavata/airavata"
+deployment_dir: "/Users/machrist/Documents/Airavata/LocalAiravata"
http://git-wip-us.apache.org/repos/asf/airavata/blob/4b54ff60/dev-tools/ansible/inventories/testing-0.17/group_vars/all.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17/group_vars/all.yml b/dev-tools/ansible/inventories/testing-0.17/group_vars/all.yml
new file mode 100644
index 0000000..6818d31
--- /dev/null
+++ b/dev-tools/ansible/inventories/testing-0.17/group_vars/all.yml
@@ -0,0 +1,91 @@
+---
+
+user: centos
+group: centos
+user_home: "/home/{{ user }}"
+
+# deployment related variables
+deployment_dir: "{{ user_home }}/deployment"
+airavata_source_dir: "{{ user_home }}/source"
+airavata_repo: "https://git-wip-us.apache.org/repos/asf/airavata.git"
+airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
+airavata_dist_name: "{{ airavata_dist }}-bin.tar.gz"
+old_airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
+git_branch: develop
+
+# Database related variables
+db_server: "{{ groups['database'][0] }}"
+db_server_port: "3306"
+db_user: "airavata"
+db_password: "airavata"
+app_catalog: "app_catalog"
+exp_catalog: "exp_catalog"
+replica_catalog: "replica_catalog"
+sharing_catalog: "sharing_catalog"
+workflow_catalog: "wf_catalog"
+credential_store: "credential_store"
+
+mysql_connector_jar: "mysql-connector-java-5.1.37-bin.jar"
+
+# Rabbitmq related vareables
+rabbitmq_server: "{{ ansible_fqdn }}"
+rabbitmq_vhost: "develop"
+rabbitmq_user: "airavata"
+rabbitmq_password: "airavata"
+rabbitmq_port: "5672"
+rabbitmq_broker_url: "amqp://{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ rabbitmq_server}}:{{ rabbitmq_port }}/{{ rabbitmq_vhost }}"
+
+# Zoookeeper related variables
+zookeeper_client_port: 2181
+zookeeper_url: "{{ groups['zookeeper'][0] }}:{{ zookeeper_client_port }}"
+# API Server related variables
+api_server_name: "apiserver-node0"
+api_server_host: "{{ansible_fqdn}}"
+api_server_port: "8930"
+api_secured: "false"
+tls_enable: "false"
+api_server_tls_port: "9930"
+enable_sharing: "true"
+
+# Orchestrator related variables
+orchestrator_name: "orchestrator-node0"
+orchestrator_host: "{{ansible_fqdn}}"
+orchestrator_port: "8940"
+api_orch_dir: "{{ deployment_dir }}/api-orchestrator"
+api_orch_server_names: "api-orch"
+
+# registry related variables
+registry_name: regserver-node0
+registry_host: "{{ ansible_fqdn }}"
+registry_port: 8970
+#registry_dir: "{{ deployment_dir }}/registry"
+default_gateway: "php_reference_gateway"
+
+# Credential and keystore related variables
+#authorization_server: "https://{{ groups['wso2is'][0]}}:9443/services/"
+authorization_server: "https://idp.scigap.org:9443/services/"
+keystore: "airavata.jks"
+keystore_passwd: "airavata"
+#client_truststore: "client_truststore.jks"
+client_truststore: "airavata.jks"
+client_truststore_passwd: "airavata"
+cred_keystore: "airavata_sym.jks"
+cred_keystore_passwd: "airavata"
+cred_keystore_alias: "airavata"
+cred_store_server_host: "{{ ansible_fqdn }}"
+cred_store_port: "8960"
+keystores_location: "{{ deployment_dir }}/keystores"
+
+# Gfac related variables
+gfac_name: "gfac-node0"
+gfac_host: "{{ ansible_fqdn }}"
+gfac_port: "8950"
+gfac_dir: "{{ deployment_dir }}/gfac-instance"
+
+# Monitoring variables
+monitor_email_address: "test.airavata@gmail.com"
+monitor_email_password: "airavata"
+
+# Sharing Registry related variables
+sharing_registry_host: "{{ ansible_fqdn }}"
+sharing_registry_port: 7878
http://git-wip-us.apache.org/repos/asf/airavata/blob/4b54ff60/dev-tools/ansible/inventories/testing-0.17/hosts
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17/hosts b/dev-tools/ansible/inventories/testing-0.17/hosts
new file mode 100644
index 0000000..b392006
--- /dev/null
+++ b/dev-tools/ansible/inventories/testing-0.17/hosts
@@ -0,0 +1,20 @@
+[zookeeper]
+149.165.168.5 ansible_user=centos
+
+[rabbitmq]
+149.165.168.5 ansible_user=centos
+
+[database]
+149.165.168.5 ansible_user=centos
+
+[api-orch]
+149.165.168.5 ansible_user=centos
+
+[gfac]
+149.165.168.5 ansible_user=centos
+
+# NOTE: the registry is NOT deployed separately from the API server, but some
+# of the playbooks assume that there is a 'registry' group, so this entry
+# needs to be here as a workaround
+[registry]
+149.165.168.5 ansible_user=centos
http://git-wip-us.apache.org/repos/asf/airavata/blob/4b54ff60/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
new file mode 100644
index 0000000..26f5c7c
--- /dev/null
+++ b/dev-tools/ansible/roles/api-orch/defaults/main.yml
@@ -0,0 +1 @@
+api_orch_server_names: "api-orch"
http://git-wip-us.apache.org/repos/asf/airavata/blob/4b54ff60/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 bf92e39..cb69c9f 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
@@ -50,6 +50,11 @@ 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.repeat.time=18000
###########################################################################
# Application Catalog DB Configuration
@@ -104,6 +109,13 @@ sharingcatalog.jdbc.password={{ db_password }}
sharingcatalog.validationQuery=SELECT 1 from CONFIGURATION
###########################################################################
+# Sharing Registry Server Configuration
+###########################################################################
+sharing_server=org.apache.airavata.sharing.registry.server.SharingRegistryServer
+sharing.registry.server.host={{ sharing_registry_host }}
+sharing.registry.server.port={{ sharing_registry_port }}
+
+###########################################################################
# User Profile MongoDB Configuration
###########################################################################
userprofile.mongodb.host=localhost
http://git-wip-us.apache.org/repos/asf/airavata/blob/4b54ff60/dev-tools/ansible/roles/database/files/MariaDB_yum_CentOS_7.repo
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/database/files/MariaDB_yum_CentOS_7.repo b/dev-tools/ansible/roles/database/files/MariaDB_yum_CentOS_7.repo
new file mode 100644
index 0000000..886d14b
--- /dev/null
+++ b/dev-tools/ansible/roles/database/files/MariaDB_yum_CentOS_7.repo
@@ -0,0 +1,7 @@
+# MariaDB 10.0 CentOS repository list - created 2017-03-06 19:32 UTC
+# http://downloads.mariadb.org/mariadb/repositories/
+[mariadb]
+name = MariaDB
+baseurl = http://yum.mariadb.org/10.0/centos7-amd64
+gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB
+gpgcheck=1
http://git-wip-us.apache.org/repos/asf/airavata/blob/4b54ff60/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 17e5b0d..91e52c2 100644
--- a/dev-tools/ansible/roles/database/tasks/main.yml
+++ b/dev-tools/ansible/roles/database/tasks/main.yml
@@ -24,13 +24,23 @@
become_user: root
# when: ansible_os_family == 'RedHat'
+- name: Add MariaDB yum repository on CentOS
+ copy: src="MariaDB_yum_CentOS_{{ ansible_distribution_major_version }}.repo"
+ dest="/etc/yum.repos.d/"
+ become_user: root
+ when: ansible_distribution == 'CentOS'
+
- name: install mariadb
yum: name="{{ item }}" state=latest update_cache=yes
with_items: "{{ mysql_packages }}"
become_user: root
+# 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/
+# 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
- service: name=mariadb state=started enabled=yes
+ service: name=mysql state=started enabled=yes
become_user: root
- include: secure_install.yml
http://git-wip-us.apache.org/repos/asf/airavata/blob/4b54ff60/dev-tools/ansible/roles/database/vars/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/database/vars/main.yml b/dev-tools/ansible/roles/database/vars/main.yml
index 1f37424..d7f814d 100644
--- a/dev-tools/ansible/roles/database/vars/main.yml
+++ b/dev-tools/ansible/roles/database/vars/main.yml
@@ -1,7 +1,7 @@
---
mysql_packages:
- - mariadb-server
- - mariadb
+ - MariaDB-server
+ - MariaDB-client
mysql_root_password: "admin"
mysql_databases:
@@ -10,6 +10,7 @@ mysql_databases:
- "{{ replica_catalog }}"
- "{{ workflow_catalog }}"
- "{{ credential_store }}"
+ - "{{ sharing_catalog }}"
mysql_privs:
- "{{ app_catalog }}.*:ALL"
@@ -17,5 +18,6 @@ mysql_privs:
- "{{ replica_catalog }}.*:ALL"
- "{{ workflow_catalog }}.*:ALL"
- "{{ credential_store }}.*:ALL"
+ - "{{ sharing_catalog }}.*:ALL"
...
[34/50] airavata git commit: sending owner permission users along
with read and write
Posted by sm...@apache.org.
sending owner permission users along with read and write
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/118c7bcc
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/118c7bcc
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/118c7bcc
Branch: refs/heads/master
Commit: 118c7bccee8ee414a5c458421960abbe59b16816
Parents: f4edced
Author: scnakandala <su...@gmail.com>
Authored: Thu Mar 23 15:59:42 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Thu Mar 23 15:59:42 2017 -0400
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 23 +++++++++++++-------
1 file changed, 15 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/118c7bcc/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index 99f8fa4..3cabf3c 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -4657,22 +4657,29 @@ public class AiravataServerHandler implements Airavata.Iface {
RegistryService.Client regClient = registryClientPool.getResource();
SharingRegistryService.Client sharingClient = sharingClientPool.getResource();
try {
- List<String> accessibleUsers = new ArrayList<>();
- if(permissionType.equals(ResourcePermissionType.WRITE))
+ HashSet<String> accessibleUsers = new HashSet<>();
+ if (permissionType.equals(ResourcePermissionType.WRITE)) {
sharingClient.getListOfSharedUsers(authzToken.getClaimsMap().get(Constants.GATEWAY_ID),
resourceId, authzToken.getClaimsMap().get(Constants.GATEWAY_ID)
- + ":WRITE").stream().forEach(u->accessibleUsers.add(u.userId));
- else if(permissionType.equals(ResourcePermissionType.READ))
+ + ":WRITE").stream().forEach(u -> accessibleUsers.add(u.userId));
sharingClient.getListOfSharedUsers(authzToken.getClaimsMap().get(Constants.GATEWAY_ID),
resourceId, authzToken.getClaimsMap().get(Constants.GATEWAY_ID)
- + ":READ").stream().forEach(u->accessibleUsers.add(u.userId));
- else if(permissionType.equals(ResourcePermissionType.OWNER))
+ + ":OWNER").stream().forEach(u -> accessibleUsers.add(u.userId));
+ } else if (permissionType.equals(ResourcePermissionType.READ)) {
sharingClient.getListOfSharedUsers(authzToken.getClaimsMap().get(Constants.GATEWAY_ID),
resourceId, authzToken.getClaimsMap().get(Constants.GATEWAY_ID)
- + ":OWNER").stream().forEach(u->accessibleUsers.add(u.userId));
+ + ":READ").stream().forEach(u -> accessibleUsers.add(u.userId));
+ sharingClient.getListOfSharedUsers(authzToken.getClaimsMap().get(Constants.GATEWAY_ID),
+ resourceId, authzToken.getClaimsMap().get(Constants.GATEWAY_ID)
+ + ":OWNER").stream().forEach(u -> accessibleUsers.add(u.userId));
+ } else if (permissionType.equals(ResourcePermissionType.OWNER)) {
+ sharingClient.getListOfSharedUsers(authzToken.getClaimsMap().get(Constants.GATEWAY_ID),
+ resourceId, authzToken.getClaimsMap().get(Constants.GATEWAY_ID)
+ + ":OWNER").stream().forEach(u -> accessibleUsers.add(u.userId));
+ }
registryClientPool.returnResource(regClient);
sharingClientPool.returnResource(sharingClient);
- return accessibleUsers;
+ return new ArrayList<>(accessibleUsers);
} catch (Exception e) {
String msg = "Error in getting all accessible users for resource. Resource ID : " + resourceId + " Resource Type : " + resourceType.toString() ;
logger.error(msg, e);
[30/50] airavata git commit: geogateway pga ansible script changes
Posted by sm...@apache.org.
geogateway pga ansible script changes
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/058cf708
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/058cf708
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/058cf708
Branch: refs/heads/master
Commit: 058cf708665deaf782a9d8aff45907722a0421c0
Parents: 45edb67
Author: Marcus Christie <ma...@apache.org>
Authored: Tue Mar 21 12:16:31 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue Mar 21 12:17:09 2017 -0400
----------------------------------------------------------------------
.../ansible/inventories/geogateway-dev/group_vars/pga/vars.yml | 5 ++---
dev-tools/ansible/inventories/geogateway-dev/hosts | 2 +-
.../inventories/testing-0.17-scigap/group_vars/pga/vars.yml | 2 +-
.../inventories/testing-0.17-testdrive/group_vars/pga/vars.yml | 2 +-
.../ansible/inventories/testing-0.17/group_vars/pga/vars.yml | 2 +-
5 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/058cf708/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 dc0afea..be83e30 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
@@ -1,6 +1,6 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-pga_git_branch: "develop"
+git_branch: "develop"
user: "pga"
group: "pga"
pga_user: "pga"
@@ -23,8 +23,7 @@ airavata_port: "9930"
gateway_id: "GeoGateway"
# 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.79_80025f37-19e4-496e-962e-d6fa75a5f63c"
## Portal related variables
super_admin_portal: "false"
http://git-wip-us.apache.org/repos/asf/airavata/blob/058cf708/dev-tools/ansible/inventories/geogateway-dev/hosts
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/geogateway-dev/hosts b/dev-tools/ansible/inventories/geogateway-dev/hosts
index 197b94a..d6faaa0 100644
--- a/dev-tools/ansible/inventories/geogateway-dev/hosts
+++ b/dev-tools/ansible/inventories/geogateway-dev/hosts
@@ -1,2 +1,2 @@
[pga]
-gw137.iu.xsede.org ansible_user=root
+149.165.156.79 ansible_user=centos
http://git-wip-us.apache.org/repos/asf/airavata/blob/058cf708/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 17080c5..e85b8dc 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
@@ -1,6 +1,6 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-pga_git_branch: "develop"
+git_branch: "develop"
pga_user: "pga"
pga_group: "pga"
doc_root_dir: "/var/www/html/php-gateway"
http://git-wip-us.apache.org/repos/asf/airavata/blob/058cf708/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 b32b50c..371331a 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
@@ -1,6 +1,6 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-pga_git_branch: "develop"
+git_branch: "develop"
pga_user: "pga"
pga_group: "pga"
doc_root_dir: "/var/www/html/php-gateway"
http://git-wip-us.apache.org/repos/asf/airavata/blob/058cf708/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 1318ef5..9614541 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
@@ -1,6 +1,6 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-pga_git_branch: "develop"
+git_branch: "develop"
pga_user: "pga"
pga_group: "pga"
doc_root_dir: "/var/www/html/php-gateway"
[12/50] airavata git commit: changin the data type to long
Posted by sm...@apache.org.
changin the data type to long
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7beb6a4d
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7beb6a4d
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7beb6a4d
Branch: refs/heads/master
Commit: 7beb6a4da010617baaee9cad251eac0ba6e10247
Parents: 505e30c
Author: scnakandala <su...@gmail.com>
Authored: Thu Mar 16 14:47:13 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Thu Mar 16 14:47:13 2017 -0400
----------------------------------------------------------------------
.../sharing/registry/db/repositories/EntityRepository.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7beb6a4d/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
index 577d17e..26c15f0 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
@@ -146,7 +146,7 @@ public class EntityRepository extends AbstractRepository<Entity, EntityEntity, E
entity.setBinaryData((byte[]) (rs[7]));
entity.setFullText((String) (rs[8]));
entity.setOriginalEntityCreationTime((long)(rs[9]));
- entity.setSharedCount((int) rs[10]);
+ entity.setSharedCount((long) rs[10]);
entity.setCreatedTime((long) (rs[11]));
entity.setUpdatedTime((long) (rs[12]));
[21/50] airavata git commit: updating the 0.16-0.17 delta scripts
Posted by sm...@apache.org.
updating the 0.16-0.17 delta scripts
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7cf48b3b
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7cf48b3b
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7cf48b3b
Branch: refs/heads/master
Commit: 7cf48b3bb12b1ad1860b2396ea5fc15dd4d3a6c7
Parents: eb7cbc5
Author: Anuj Bhandar <bh...@gmail.com>
Authored: Fri Mar 17 17:48:06 2017 -0400
Committer: Anuj Bhandar <bh...@gmail.com>
Committed: Fri Mar 17 17:48:51 2017 -0400
----------------------------------------------------------------------
.../DeltaScripts/appCatalog_schema_delta.sql | 49 ++++++++++----------
.../credentialStore_schema_delta.sql | 2 +-
.../DeltaScripts/expCatalog_schema_delta.sql | 16 ++++---
.../replicaCatalog_schema_delta.sql | 2 +-
4 files changed, 36 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7cf48b3b/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/appCatalog_schema_delta.sql
----------------------------------------------------------------------
diff --git a/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/appCatalog_schema_delta.sql b/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/appCatalog_schema_delta.sql
index 65f0cdd..e2f5dec 100644
--- a/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/appCatalog_schema_delta.sql
+++ b/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/appCatalog_schema_delta.sql
@@ -8,6 +8,25 @@ the License. */
# Will migrate 0.16 DataBase schema to 0.17 Database Schema
+CREATE TABLE `USER_RESOURCE_PROFILE` (
+ `USER_ID` varchar(255) NOT NULL,
+ `CREATION_TIME` datetime DEFAULT NULL,
+ `CS_TOKEN` varchar(255) DEFAULT NULL,
+ `GATEWAY_ID` varchar(255) DEFAULT NULL,
+ `IDENTITY_SERVER_PWD_CRED_TOKEN` varchar(255) DEFAULT NULL,
+ `IDENTITY_SERVER_TENANT` varchar(255) DEFAULT NULL,
+ `UPDATE_TIME` datetime DEFAULT NULL,
+ PRIMARY KEY (`USER_ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+CREATE TABLE `USER_STORAGE_PREFERENCE` (
+ `STORAGE_RESOURCE_ID` varchar(255) NOT NULL,
+ `USER_ID` varchar(255) NOT NULL,
+ `RESOURCE_CS_TOKEN` varchar(255) DEFAULT NULL,
+ `FS_ROOT_LOCATION` varchar(255) DEFAULT NULL,
+ `GATEWAY_ID` varchar(255) DEFAULT NULL,
+ `LOGIN_USERNAME` varchar(255) DEFAULT NULL,
+ PRIMARY KEY (`STORAGE_RESOURCE_ID`,`USER_ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
CREATE TABLE `CLOUD_JOB_SUBMISSION` (
`JOB_SUBMISSION_INTERFACE_ID` varchar(255) NOT NULL,
`EXECUTABLE_TYPE` varchar(255) DEFAULT NULL,
@@ -32,32 +51,14 @@ CREATE TABLE `USER_COMPUTE_RESOURCE_PREFERENCE` (
`SCRATCH_LOCATION` varchar(255) DEFAULT NULL,
PRIMARY KEY (`RESOURCE_ID`,`USER_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-CREATE TABLE `USER_RESOURCE_PROFILE` (
- `USER_ID` varchar(255) NOT NULL,
- `CREATION_TIME` datetime DEFAULT NULL,
- `CS_TOKEN` varchar(255) DEFAULT NULL,
- `GATEWAY_ID` varchar(255) DEFAULT NULL,
- `IDENTITY_SERVER_PWD_CRED_TOKEN` varchar(255) DEFAULT NULL,
- `IDENTITY_SERVER_TENANT` varchar(255) DEFAULT NULL,
- `UPDATE_TIME` datetime DEFAULT NULL,
- PRIMARY KEY (`USER_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-CREATE TABLE `USER_STORAGE_PREFERENCE` (
- `STORAGE_RESOURCE_ID` varchar(255) NOT NULL,
- `USER_ID` varchar(255) NOT NULL,
- `RESOURCE_CS_TOKEN` varchar(255) DEFAULT NULL,
- `FS_ROOT_LOCATION` varchar(255) DEFAULT NULL,
- `GATEWAY_ID` varchar(255) DEFAULT NULL,
- `LOGIN_USERNAME` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`STORAGE_RESOURCE_ID`,`USER_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-ALTER TABLE `APPLICATION_DEPLOYMENT` ADD `DEFAULT_CPU_COUNT` int(11) DEFAULT NULL;
-ALTER TABLE `APPLICATION_DEPLOYMENT` ADD `DEFAULT_NODE_COUNT` int(11) DEFAULT NULL;
-ALTER TABLE `APPLICATION_DEPLOYMENT` ADD `DEFAULT_QUEUE_NAME` varchar(255) DEFAULT NULL;
-ALTER TABLE `APPLICATION_DEPLOYMENT` ADD `EDITABLE_BY_USER` bit(1) DEFAULT NULL;
-ALTER TABLE `BATCH_QUEUE` ADD `CPU_PER_NODE` int(11) DEFAULT NULL;
ALTER TABLE `BATCH_QUEUE` ADD `DEFAULT_CPU_COUNT` int(11) DEFAULT NULL;
ALTER TABLE `BATCH_QUEUE` ADD `DEFAULT_NODE_COUNT` int(11) DEFAULT NULL;
ALTER TABLE `BATCH_QUEUE` ADD `IS_DEFAULT_QUEUE` bit(1) DEFAULT NULL;
+ALTER TABLE `BATCH_QUEUE` ADD `CPU_PER_NODE` int(11) DEFAULT NULL;
ALTER TABLE `LOCAL_SUBMISSION` ADD `SECURITY_PROTOCOL` varchar(255) DEFAULT NULL;
+ALTER TABLE `APPLICATION_DEPLOYMENT` ADD `DEFAULT_QUEUE_NAME` varchar(255) DEFAULT NULL;
+ALTER TABLE `APPLICATION_DEPLOYMENT` ADD `DEFAULT_CPU_COUNT` int(11) DEFAULT NULL;
+ALTER TABLE `APPLICATION_INPUT` ADD `IS_READ_ONLY` tinyint(1) NOT NULL DEFAULT '0';
+ALTER TABLE `APPLICATION_DEPLOYMENT` ADD `DEFAULT_NODE_COUNT` int(11) DEFAULT NULL;
+ALTER TABLE `APPLICATION_DEPLOYMENT` ADD `EDITABLE_BY_USER` bit(1) DEFAULT NULL;
ALTER TABLE `GATEWAY_CLIENT_CREDENTIAL` CHANGE `CLIENT_KEY` `CLIENT_KEY` varchar(255) NOT NULL;
http://git-wip-us.apache.org/repos/asf/airavata/blob/7cf48b3b/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/credentialStore_schema_delta.sql
----------------------------------------------------------------------
diff --git a/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/credentialStore_schema_delta.sql b/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/credentialStore_schema_delta.sql
index 3a2c1b1..3a4651f 100644
--- a/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/credentialStore_schema_delta.sql
+++ b/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/credentialStore_schema_delta.sql
@@ -13,5 +13,5 @@ CREATE TABLE `CONFIGURATION` (
`CONFIG_VAL` varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY (`CONFIG_KEY`,`CONFIG_VAL`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-ALTER TABLE `CREDENTIALS` ADD `DESCRIPTION` varchar(512) DEFAULT NULL;
ALTER TABLE `CREDENTIALS` ADD `CREDENTIAL_OWNER_TYPE` varchar(10) NOT NULL DEFAULT 'GATEWAY';
+ALTER TABLE `CREDENTIALS` ADD `DESCRIPTION` varchar(512) DEFAULT NULL;
http://git-wip-us.apache.org/repos/asf/airavata/blob/7cf48b3b/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/expCatalog_schema_delta.sql
----------------------------------------------------------------------
diff --git a/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/expCatalog_schema_delta.sql b/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/expCatalog_schema_delta.sql
index 38bf61c..6785092 100644
--- a/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/expCatalog_schema_delta.sql
+++ b/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/expCatalog_schema_delta.sql
@@ -17,16 +17,18 @@ CREATE TABLE `QUEUE_STATUS` (
`RUNNING_JOBS` int(11) DEFAULT NULL,
PRIMARY KEY (`HOST_NAME`,`QUEUE_NAME`,`CREATED_TIME`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-ALTER TABLE `GATEWAY` ADD `DECLINED_REASON` varchar(255) DEFAULT NULL;
-ALTER TABLE `GATEWAY` ADD `OAUTH_CLIENT_SECRET` varchar(255) DEFAULT NULL;
-ALTER TABLE `GATEWAY` ADD `OAUTH_CLIENT_ID` varchar(255) DEFAULT NULL;
-ALTER TABLE `GATEWAY` ADD `REQUEST_CREATION_TIME` datetime DEFAULT CURRENT_TIMESTAMP;
ALTER TABLE `GATEWAY` ADD `REQUESTER_USERNAME` varchar(255) DEFAULT NULL;
ALTER TABLE `GATEWAY` ADD `GATEWAY_DOMAIN` varchar(255) DEFAULT NULL;
-ALTER TABLE `PROCESS` ADD `USE_USER_CR_PREF` bit(1) DEFAULT NULL;
ALTER TABLE `USER_CONFIGURATION_DATA` ADD `IS_USE_USER_CR_PREF` bit(1) DEFAULT NULL;
+ALTER TABLE `PROCESS_INPUT` ADD `IS_READ_ONLY` smallint(1) NOT NULL DEFAULT '0';
+ALTER TABLE `PROCESS` ADD `USE_USER_CR_PREF` bit(1) DEFAULT NULL;
+ALTER TABLE `GATEWAY` ADD `REQUEST_CREATION_TIME` datetime DEFAULT CURRENT_TIMESTAMP;
+ALTER TABLE `EXPERIMENT_INPUT` ADD `IS_READ_ONLY` smallint(1) NOT NULL DEFAULT '0';
+ALTER TABLE `GATEWAY` ADD `OAUTH_CLIENT_ID` varchar(255) DEFAULT NULL;
+ALTER TABLE `GATEWAY` ADD `DECLINED_REASON` varchar(255) DEFAULT NULL;
+ALTER TABLE `GATEWAY` ADD `OAUTH_CLIENT_SECRET` varchar(255) DEFAULT NULL;
+ALTER TABLE `USERS` CHANGE `AIRAVATA_INTERNAL_USER_ID` `AIRAVATA_INTERNAL_USER_ID` varchar(255) NOT NULL;
ALTER TABLE `EXPERIMENT_STATUS` CHANGE `TIME_OF_STATE_CHANGE` `TIME_OF_STATE_CHANGE` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
-ALTER TABLE `JOB_STATUS` CHANGE `TIME_OF_STATE_CHANGE` `TIME_OF_STATE_CHANGE` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
ALTER TABLE `NOTIFICATION` CHANGE `NOTIFICATION_MESSAGE` `NOTIFICATION_MESSAGE` varchar(4096) NOT NULL;
-ALTER TABLE `USERS` CHANGE `AIRAVATA_INTERNAL_USER_ID` `AIRAVATA_INTERNAL_USER_ID` varchar(255) NOT NULL;
+ALTER TABLE `JOB_STATUS` CHANGE `TIME_OF_STATE_CHANGE` `TIME_OF_STATE_CHANGE` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
ALTER TABLE `USERS` ADD UNIQUE KEY `AIRAVATA_INTERNAL_USER_ID` (`AIRAVATA_INTERNAL_USER_ID`);
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/7cf48b3b/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/replicaCatalog_schema_delta.sql
----------------------------------------------------------------------
diff --git a/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/replicaCatalog_schema_delta.sql b/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/replicaCatalog_schema_delta.sql
index c00e653..3ef3f6f 100644
--- a/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/replicaCatalog_schema_delta.sql
+++ b/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/replicaCatalog_schema_delta.sql
@@ -9,4 +9,4 @@ the License. */
# Will migrate 0.16 DataBase schema to 0.17 Database Schema
ALTER TABLE `DATA_PRODUCT` ADD KEY `PARENT_PRODUCT_URI` (`PARENT_PRODUCT_URI`);
-ALTER TABLE `DATA_PRODUCT` ADD CONSTRAINT `DATA_PRODUCT_ibfk_1` FOREIGN KEY (`PARENT_PRODUCT_URI`) REFERENCES `DATA_PRODUCT` (`PRODUCT_URI`) ON DELETE CASCADE;
\ No newline at end of file
+ALTER TABLE `DATA_PRODUCT` ADD CONSTRAINT `DATA_PRODUCT_ibfk_1` FOREIGN KEY (`PARENT_PRODUCT_URI`) REFERENCES `DATA_PRODUCT` (`PRODUCT_URI`) ON DELETE CASCADE;
[11/50] airavata git commit: AIRAVATA-2335 Moving hosts into
inventories dir
Posted by sm...@apache.org.
AIRAVATA-2335 Moving hosts into inventories dir
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/fc720d46
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/fc720d46
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/fc720d46
Branch: refs/heads/master
Commit: fc720d464bd95194db237cb7d6955308c027335c
Parents: 505e30c
Author: Marcus Christie <ma...@apache.org>
Authored: Thu Mar 16 14:41:17 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Thu Mar 16 14:42:14 2017 -0400
----------------------------------------------------------------------
dev-tools/ansible/hosts | 35 ------------------------
dev-tools/ansible/inventories/develop/hosts | 35 ++++++++++++++++++++++++
2 files changed, 35 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/fc720d46/dev-tools/ansible/hosts
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/hosts b/dev-tools/ansible/hosts
deleted file mode 100644
index 7a88ccf..0000000
--- a/dev-tools/ansible/hosts
+++ /dev/null
@@ -1,35 +0,0 @@
----
-# inventory file : production
-
-[zookeeper]
-149.165.171.13
-
-[rabbitmq]
-149.165.171.12
-
-[database]
-149.165.171.1
-
-#[wso2is]
-#52.87.209.219
-
-[registry]
-149.165.171.0
-
-[api-orch]
-149.165.170.105
-
-[gfac]
-149.165.171.0
-
-[pga]
-149.165.170.103
-
-[local]
-localhost ansible_connection=local
-
-[dev-airavata]
-gw56.iu.xsede.org ansible_user=airavata
-
-[dev-pga]
-gw54.iu.xsede.org ansible_user=pga
http://git-wip-us.apache.org/repos/asf/airavata/blob/fc720d46/dev-tools/ansible/inventories/develop/hosts
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/develop/hosts b/dev-tools/ansible/inventories/develop/hosts
new file mode 100644
index 0000000..7a88ccf
--- /dev/null
+++ b/dev-tools/ansible/inventories/develop/hosts
@@ -0,0 +1,35 @@
+---
+# inventory file : production
+
+[zookeeper]
+149.165.171.13
+
+[rabbitmq]
+149.165.171.12
+
+[database]
+149.165.171.1
+
+#[wso2is]
+#52.87.209.219
+
+[registry]
+149.165.171.0
+
+[api-orch]
+149.165.170.105
+
+[gfac]
+149.165.171.0
+
+[pga]
+149.165.170.103
+
+[local]
+localhost ansible_connection=local
+
+[dev-airavata]
+gw56.iu.xsede.org ansible_user=airavata
+
+[dev-pga]
+gw54.iu.xsede.org ansible_user=pga
[44/50] airavata git commit: AIRAVATA-2347 Removing use of
gatewayResource, GATEWAY_WORKER stuff
Posted by sm...@apache.org.
AIRAVATA-2347 Removing use of gatewayResource, GATEWAY_WORKER stuff
I don't think the GATEWAY_WORKER stuff is needed any longer. Also, the
ExperimentCatalog is instantiated in the RegistryServerHandler as a singleton
with reference to a gatewayId, so it has the incorrect gatewayId for this request and can't be
trusted. This shows up here where the gatewayResource actually references the
default gateway from the airavata-server.properties file instead of the gateway
in the request.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/053df2f0
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/053df2f0
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/053df2f0
Branch: refs/heads/master
Commit: 053df2f03db57a8edbe136908ef697e7cc691b81
Parents: 9b4c968
Author: Marcus Christie <ma...@apache.org>
Authored: Tue Mar 28 10:19:40 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue Mar 28 10:19:40 2017 -0400
----------------------------------------------------------------------
.../core/experiment/catalog/impl/ProjectRegistry.java | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/053df2f0/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ProjectRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ProjectRegistry.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ProjectRegistry.java
index 9e32ef3..fabc9f4 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ProjectRegistry.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ProjectRegistry.java
@@ -93,15 +93,7 @@ public class ProjectRegistry {
ProjectResource existingProject = workerResource.getProject(projectId);
existingProject.setDescription(project.getDescription());
existingProject.setName(project.getName());
-// existingProject.setGateway(gatewayResource);
- UserResource user = (UserResource) ExpCatResourceUtils.getUser(project.getOwner(),gatewayResource.getGatewayId());
- if (!gatewayResource.isExists(ResourceType.GATEWAY_WORKER, user.getUserName())){
- workerResource = ExpCatResourceUtils.addGatewayWorker(gatewayResource, user);
- }else {
- workerResource = (WorkerResource) ExpCatResourceUtils.getWorker(
- gatewayResource.getGatewayId(), user.getUserName());
- }
- WorkerResource worker = new WorkerResource(project.getOwner(), gatewayResource.getGatewayId());
+ WorkerResource worker = new WorkerResource(project.getOwner(), project.getGatewayId());
existingProject.setWorker(worker);
existingProject.save();
ProjectUserResource resource = (ProjectUserResource)existingProject.create(
[38/50] airavata git commit: adding owner permission along with read
and write
Posted by sm...@apache.org.
adding owner permission along with read and write
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/44abf367
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/44abf367
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/44abf367
Branch: refs/heads/master
Commit: 44abf36705724cad722ed1ef9253eeecf41a42cd
Parents: 9d41944
Author: scnakandala <su...@gmail.com>
Authored: Fri Mar 24 11:11:43 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Fri Mar 24 11:11:43 2017 -0400
----------------------------------------------------------------------
.../airavata/api/server/handler/AiravataServerHandler.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/44abf367/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index d2e041d..3cabf3c 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -4662,10 +4662,16 @@ public class AiravataServerHandler implements Airavata.Iface {
sharingClient.getListOfSharedUsers(authzToken.getClaimsMap().get(Constants.GATEWAY_ID),
resourceId, authzToken.getClaimsMap().get(Constants.GATEWAY_ID)
+ ":WRITE").stream().forEach(u -> accessibleUsers.add(u.userId));
+ sharingClient.getListOfSharedUsers(authzToken.getClaimsMap().get(Constants.GATEWAY_ID),
+ resourceId, authzToken.getClaimsMap().get(Constants.GATEWAY_ID)
+ + ":OWNER").stream().forEach(u -> accessibleUsers.add(u.userId));
} else if (permissionType.equals(ResourcePermissionType.READ)) {
sharingClient.getListOfSharedUsers(authzToken.getClaimsMap().get(Constants.GATEWAY_ID),
resourceId, authzToken.getClaimsMap().get(Constants.GATEWAY_ID)
+ ":READ").stream().forEach(u -> accessibleUsers.add(u.userId));
+ sharingClient.getListOfSharedUsers(authzToken.getClaimsMap().get(Constants.GATEWAY_ID),
+ resourceId, authzToken.getClaimsMap().get(Constants.GATEWAY_ID)
+ + ":OWNER").stream().forEach(u -> accessibleUsers.add(u.userId));
} else if (permissionType.equals(ResourcePermissionType.OWNER)) {
sharingClient.getListOfSharedUsers(authzToken.getClaimsMap().get(Constants.GATEWAY_ID),
resourceId, authzToken.getClaimsMap().get(Constants.GATEWAY_ID)
[37/50] airavata git commit: changing the derby script
Posted by sm...@apache.org.
changing the derby script
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/9d419449
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/9d419449
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/9d419449
Branch: refs/heads/master
Commit: 9d419449707279aa186a094379ce2d8122801dbd
Parents: bfc3a84
Author: scnakandala <su...@gmail.com>
Authored: Thu Mar 23 17:00:32 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Thu Mar 23 17:00:32 2017 -0400
----------------------------------------------------------------------
.../airavata/sharing/registry/db/entities/EntityEntity.java | 6 +++---
.../src/main/resources/sharing-registry-derby.sql | 2 +-
.../src/main/resources/sharing-registry-mysql.sql | 2 +-
.../org/apache/airavata/sharing/registry/models/Entity.java | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/9d419449/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java
index 199870c..9452f78 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java
@@ -41,7 +41,7 @@ public class EntityEntity {
private ByteBuffer binaryData;
private String fullText;
private Long originalEntityCreationTime;
- private int sharedCount;
+ private Long sharedCount;
private Long createdTime;
private Long updatedTime;
@@ -147,11 +147,11 @@ public class EntityEntity {
@Basic
@Column(name = "SHARED_COUNT")
- public int getSharedCount() {
+ public Long getSharedCount() {
return sharedCount;
}
- public void setSharedCount(int sharedCount) {
+ public void setSharedCount(Long sharedCount) {
this.sharedCount = sharedCount;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/9d419449/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql b/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql
index 4a71a99..6233896 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql
+++ b/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql
@@ -101,7 +101,7 @@ CREATE TABLE ENTITY (
DESCRIPTION VARCHAR(255),
BINARY_DATA BLOB,
FULL_TEXT VARCHAR(255),
- SHARED_COUNT INT DEFAULT 0,
+ SHARED_COUNT BIGINT DEFAULT 0,
ORIGINAL_ENTITY_CREATION_TIME BIGINT NOT NULL,
CREATED_TIME BIGINT NOT NULL,
UPDATED_TIME BIGINT NOT NULL,
http://git-wip-us.apache.org/repos/asf/airavata/blob/9d419449/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-mysql.sql b/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-mysql.sql
index ad5f435..ed4112c 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-mysql.sql
+++ b/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-mysql.sql
@@ -101,7 +101,7 @@ CREATE TABLE ENTITY (
DESCRIPTION VARCHAR(255),
BINARY_DATA BLOB,
FULL_TEXT TEXT,
- SHARED_COUNT INT(4) DEFAULT 0,
+ SHARED_COUNT BIGINT DEFAULT 0,
ORIGINAL_ENTITY_CREATION_TIME BIGINT NOT NULL,
CREATED_TIME BIGINT NOT NULL,
UPDATED_TIME BIGINT NOT NULL,
http://git-wip-us.apache.org/repos/asf/airavata/blob/9d419449/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java
index a937c09..d04a89e 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java
@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
* <li>updatedTime : Will be set by the system</li>
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2017-03-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>, java.io.Serializable, Cloneable, Comparable<Entity> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Entity");
[17/50] airavata git commit: changing the order
Posted by sm...@apache.org.
changing the order
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a135c82e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a135c82e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a135c82e
Branch: refs/heads/master
Commit: a135c82e93a67f9945b6173689974a54b8f03e97
Parents: 5d1b345
Author: scnakandala <su...@gmail.com>
Authored: Thu Mar 16 15:47:25 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Thu Mar 16 15:47:25 2017 -0400
----------------------------------------------------------------------
.../sharing/registry/models/Entity.java | 226 +++++++++----------
.../api-docs/sharing_models.html | 13 +-
.../thrift_models/sharing_models.thrift | 4 +-
3 files changed, 118 insertions(+), 125 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/a135c82e/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java
index 8b8a83c..36fa51e 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java
@@ -6,32 +6,16 @@
*/
package org.apache.airavata.sharing.registry.models;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
-
import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
+
import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.nio.ByteBuffer;
+import java.util.*;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
@@ -64,8 +48,8 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
private static final org.apache.thrift.protocol.TField DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("description", org.apache.thrift.protocol.TType.STRING, (short)7);
private static final org.apache.thrift.protocol.TField BINARY_DATA_FIELD_DESC = new org.apache.thrift.protocol.TField("binaryData", org.apache.thrift.protocol.TType.STRING, (short)8);
private static final org.apache.thrift.protocol.TField FULL_TEXT_FIELD_DESC = new org.apache.thrift.protocol.TField("fullText", org.apache.thrift.protocol.TType.STRING, (short)9);
- private static final org.apache.thrift.protocol.TField ORIGINAL_ENTITY_CREATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("originalEntityCreationTime", org.apache.thrift.protocol.TType.I64, (short)10);
- private static final org.apache.thrift.protocol.TField SHARED_COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("sharedCount", org.apache.thrift.protocol.TType.I64, (short)11);
+ private static final org.apache.thrift.protocol.TField SHARED_COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("sharedCount", org.apache.thrift.protocol.TType.I32, (short) 10);
+ private static final org.apache.thrift.protocol.TField ORIGINAL_ENTITY_CREATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("originalEntityCreationTime", org.apache.thrift.protocol.TType.I64, (short) 11);
private static final org.apache.thrift.protocol.TField CREATED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("createdTime", org.apache.thrift.protocol.TType.I64, (short)12);
private static final org.apache.thrift.protocol.TField UPDATED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("updatedTime", org.apache.thrift.protocol.TType.I64, (short)13);
@@ -84,8 +68,8 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
public String description; // optional
public ByteBuffer binaryData; // optional
public String fullText; // optional
+ public int sharedCount; // optional
public long originalEntityCreationTime; // optional
- public long sharedCount; // optional
public long createdTime; // optional
public long updatedTime; // optional
@@ -100,8 +84,8 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
DESCRIPTION((short)7, "description"),
BINARY_DATA((short)8, "binaryData"),
FULL_TEXT((short)9, "fullText"),
- ORIGINAL_ENTITY_CREATION_TIME((short)10, "originalEntityCreationTime"),
- SHARED_COUNT((short)11, "sharedCount"),
+ SHARED_COUNT((short) 10, "sharedCount"),
+ ORIGINAL_ENTITY_CREATION_TIME((short) 11, "originalEntityCreationTime"),
CREATED_TIME((short)12, "createdTime"),
UPDATED_TIME((short)13, "updatedTime");
@@ -136,10 +120,10 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return BINARY_DATA;
case 9: // FULL_TEXT
return FULL_TEXT;
- case 10: // ORIGINAL_ENTITY_CREATION_TIME
- return ORIGINAL_ENTITY_CREATION_TIME;
- case 11: // SHARED_COUNT
+ case 10: // SHARED_COUNT
return SHARED_COUNT;
+ case 11: // ORIGINAL_ENTITY_CREATION_TIME
+ return ORIGINAL_ENTITY_CREATION_TIME;
case 12: // CREATED_TIME
return CREATED_TIME;
case 13: // UPDATED_TIME
@@ -184,12 +168,12 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
}
// isset id assignments
- private static final int __ORIGINALENTITYCREATIONTIME_ISSET_ID = 0;
- private static final int __SHAREDCOUNT_ISSET_ID = 1;
+ private static final int __SHAREDCOUNT_ISSET_ID = 0;
+ private static final int __ORIGINALENTITYCREATIONTIME_ISSET_ID = 1;
private static final int __CREATEDTIME_ISSET_ID = 2;
private static final int __UPDATEDTIME_ISSET_ID = 3;
private byte __isset_bitfield = 0;
- private static final _Fields optionals[] = {_Fields.ENTITY_ID,_Fields.DOMAIN_ID,_Fields.ENTITY_TYPE_ID,_Fields.OWNER_ID,_Fields.PARENT_ENTITY_ID,_Fields.NAME,_Fields.DESCRIPTION,_Fields.BINARY_DATA,_Fields.FULL_TEXT,_Fields.ORIGINAL_ENTITY_CREATION_TIME,_Fields.SHARED_COUNT,_Fields.CREATED_TIME,_Fields.UPDATED_TIME};
+ private static final _Fields optionals[] = {_Fields.ENTITY_ID, _Fields.DOMAIN_ID, _Fields.ENTITY_TYPE_ID, _Fields.OWNER_ID, _Fields.PARENT_ENTITY_ID, _Fields.NAME, _Fields.DESCRIPTION, _Fields.BINARY_DATA, _Fields.FULL_TEXT, _Fields.SHARED_COUNT, _Fields.ORIGINAL_ENTITY_CREATION_TIME, _Fields.CREATED_TIME, _Fields.UPDATED_TIME};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -211,10 +195,10 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true)));
tmpMap.put(_Fields.FULL_TEXT, new org.apache.thrift.meta_data.FieldMetaData("fullText", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.SHARED_COUNT, new org.apache.thrift.meta_data.FieldMetaData("sharedCount", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
tmpMap.put(_Fields.ORIGINAL_ENTITY_CREATION_TIME, new org.apache.thrift.meta_data.FieldMetaData("originalEntityCreationTime", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
- tmpMap.put(_Fields.SHARED_COUNT, new org.apache.thrift.meta_data.FieldMetaData("sharedCount", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
tmpMap.put(_Fields.CREATED_TIME, new org.apache.thrift.meta_data.FieldMetaData("createdTime", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
tmpMap.put(_Fields.UPDATED_TIME, new org.apache.thrift.meta_data.FieldMetaData("updatedTime", org.apache.thrift.TFieldRequirementType.OPTIONAL,
@@ -224,7 +208,7 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
}
public Entity() {
- this.sharedCount = 0L;
+ this.sharedCount = 0;
}
@@ -260,8 +244,8 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
if (other.isSetFullText()) {
this.fullText = other.fullText;
}
- this.originalEntityCreationTime = other.originalEntityCreationTime;
this.sharedCount = other.sharedCount;
+ this.originalEntityCreationTime = other.originalEntityCreationTime;
this.createdTime = other.createdTime;
this.updatedTime = other.updatedTime;
}
@@ -281,10 +265,10 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
this.description = null;
this.binaryData = null;
this.fullText = null;
+ this.sharedCount = 0;
+
setOriginalEntityCreationTimeIsSet(false);
this.originalEntityCreationTime = 0;
- this.sharedCount = 0L;
-
setCreatedTimeIsSet(false);
this.createdTime = 0;
setUpdatedTimeIsSet(false);
@@ -517,6 +501,31 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
}
}
+ public int getSharedCount() {
+ return this.sharedCount;
+ }
+
+ public Entity setSharedCount(int sharedCount) {
+ this.sharedCount = sharedCount;
+ setSharedCountIsSet(true);
+ return this;
+ }
+
+ public void unsetSharedCount() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SHAREDCOUNT_ISSET_ID);
+ }
+
+ /**
+ * Returns true if field sharedCount is set (has been assigned a value) and false otherwise
+ */
+ public boolean isSetSharedCount() {
+ return EncodingUtils.testBit(__isset_bitfield, __SHAREDCOUNT_ISSET_ID);
+ }
+
+ public void setSharedCountIsSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SHAREDCOUNT_ISSET_ID, value);
+ }
+
public long getOriginalEntityCreationTime() {
return this.originalEntityCreationTime;
}
@@ -540,29 +549,6 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
__isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ORIGINALENTITYCREATIONTIME_ISSET_ID, value);
}
- public long getSharedCount() {
- return this.sharedCount;
- }
-
- public Entity setSharedCount(long sharedCount) {
- this.sharedCount = sharedCount;
- setSharedCountIsSet(true);
- return this;
- }
-
- public void unsetSharedCount() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SHAREDCOUNT_ISSET_ID);
- }
-
- /** Returns true if field sharedCount is set (has been assigned a value) and false otherwise */
- public boolean isSetSharedCount() {
- return EncodingUtils.testBit(__isset_bitfield, __SHAREDCOUNT_ISSET_ID);
- }
-
- public void setSharedCountIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SHAREDCOUNT_ISSET_ID, value);
- }
-
public long getCreatedTime() {
return this.createdTime;
}
@@ -683,19 +669,19 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
}
break;
- case ORIGINAL_ENTITY_CREATION_TIME:
+ case SHARED_COUNT:
if (value == null) {
- unsetOriginalEntityCreationTime();
+ unsetSharedCount();
} else {
- setOriginalEntityCreationTime((Long)value);
+ setSharedCount((Integer) value);
}
- break;
+ break;
- case SHARED_COUNT:
+ case ORIGINAL_ENTITY_CREATION_TIME:
if (value == null) {
- unsetSharedCount();
+ unsetOriginalEntityCreationTime();
} else {
- setSharedCount((Long)value);
+ setOriginalEntityCreationTime((Long) value);
}
break;
@@ -747,12 +733,12 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
case FULL_TEXT:
return getFullText();
- case ORIGINAL_ENTITY_CREATION_TIME:
- return getOriginalEntityCreationTime();
-
case SHARED_COUNT:
return getSharedCount();
+ case ORIGINAL_ENTITY_CREATION_TIME:
+ return getOriginalEntityCreationTime();
+
case CREATED_TIME:
return getCreatedTime();
@@ -788,10 +774,10 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return isSetBinaryData();
case FULL_TEXT:
return isSetFullText();
- case ORIGINAL_ENTITY_CREATION_TIME:
- return isSetOriginalEntityCreationTime();
case SHARED_COUNT:
return isSetSharedCount();
+ case ORIGINAL_ENTITY_CREATION_TIME:
+ return isSetOriginalEntityCreationTime();
case CREATED_TIME:
return isSetCreatedTime();
case UPDATED_TIME:
@@ -894,15 +880,6 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return false;
}
- boolean this_present_originalEntityCreationTime = true && this.isSetOriginalEntityCreationTime();
- boolean that_present_originalEntityCreationTime = true && that.isSetOriginalEntityCreationTime();
- if (this_present_originalEntityCreationTime || that_present_originalEntityCreationTime) {
- if (!(this_present_originalEntityCreationTime && that_present_originalEntityCreationTime))
- return false;
- if (this.originalEntityCreationTime != that.originalEntityCreationTime)
- return false;
- }
-
boolean this_present_sharedCount = true && this.isSetSharedCount();
boolean that_present_sharedCount = true && that.isSetSharedCount();
if (this_present_sharedCount || that_present_sharedCount) {
@@ -912,6 +889,15 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return false;
}
+ boolean this_present_originalEntityCreationTime = true && this.isSetOriginalEntityCreationTime();
+ boolean that_present_originalEntityCreationTime = true && that.isSetOriginalEntityCreationTime();
+ if (this_present_originalEntityCreationTime || that_present_originalEntityCreationTime) {
+ if (!(this_present_originalEntityCreationTime && that_present_originalEntityCreationTime))
+ return false;
+ if (this.originalEntityCreationTime != that.originalEntityCreationTime)
+ return false;
+ }
+
boolean this_present_createdTime = true && this.isSetCreatedTime();
boolean that_present_createdTime = true && that.isSetCreatedTime();
if (this_present_createdTime || that_present_createdTime) {
@@ -982,16 +968,16 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
if (present_fullText)
list.add(fullText);
- boolean present_originalEntityCreationTime = true && (isSetOriginalEntityCreationTime());
- list.add(present_originalEntityCreationTime);
- if (present_originalEntityCreationTime)
- list.add(originalEntityCreationTime);
-
boolean present_sharedCount = true && (isSetSharedCount());
list.add(present_sharedCount);
if (present_sharedCount)
list.add(sharedCount);
+ boolean present_originalEntityCreationTime = true && (isSetOriginalEntityCreationTime());
+ list.add(present_originalEntityCreationTime);
+ if (present_originalEntityCreationTime)
+ list.add(originalEntityCreationTime);
+
boolean present_createdTime = true && (isSetCreatedTime());
list.add(present_createdTime);
if (present_createdTime)
@@ -1103,22 +1089,22 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetOriginalEntityCreationTime()).compareTo(other.isSetOriginalEntityCreationTime());
+ lastComparison = Boolean.valueOf(isSetSharedCount()).compareTo(other.isSetSharedCount());
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetOriginalEntityCreationTime()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.originalEntityCreationTime, other.originalEntityCreationTime);
+ if (isSetSharedCount()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sharedCount, other.sharedCount);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetSharedCount()).compareTo(other.isSetSharedCount());
+ lastComparison = Boolean.valueOf(isSetOriginalEntityCreationTime()).compareTo(other.isSetOriginalEntityCreationTime());
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetSharedCount()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sharedCount, other.sharedCount);
+ if (isSetOriginalEntityCreationTime()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.originalEntityCreationTime, other.originalEntityCreationTime);
if (lastComparison != 0) {
return lastComparison;
}
@@ -1252,18 +1238,18 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
}
first = false;
}
- if (isSetOriginalEntityCreationTime()) {
- if (!first) sb.append(", ");
- sb.append("originalEntityCreationTime:");
- sb.append(this.originalEntityCreationTime);
- first = false;
- }
if (isSetSharedCount()) {
if (!first) sb.append(", ");
sb.append("sharedCount:");
sb.append(this.sharedCount);
first = false;
}
+ if (isSetOriginalEntityCreationTime()) {
+ if (!first) sb.append(", ");
+ sb.append("originalEntityCreationTime:");
+ sb.append(this.originalEntityCreationTime);
+ first = false;
+ }
if (isSetCreatedTime()) {
if (!first) sb.append(", ");
sb.append("createdTime:");
@@ -1393,18 +1379,18 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 10: // ORIGINAL_ENTITY_CREATION_TIME
- if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
- struct.originalEntityCreationTime = iprot.readI64();
- struct.setOriginalEntityCreationTimeIsSet(true);
+ case 10: // SHARED_COUNT
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.sharedCount = iprot.readI32();
+ struct.setSharedCountIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 11: // SHARED_COUNT
+ case 11: // ORIGINAL_ENTITY_CREATION_TIME
if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
- struct.sharedCount = iprot.readI64();
- struct.setSharedCountIsSet(true);
+ struct.originalEntityCreationTime = iprot.readI64();
+ struct.setOriginalEntityCreationTimeIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -1503,16 +1489,16 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
oprot.writeFieldEnd();
}
}
+ if (struct.isSetSharedCount()) {
+ oprot.writeFieldBegin(SHARED_COUNT_FIELD_DESC);
+ oprot.writeI32(struct.sharedCount);
+ oprot.writeFieldEnd();
+ }
if (struct.isSetOriginalEntityCreationTime()) {
oprot.writeFieldBegin(ORIGINAL_ENTITY_CREATION_TIME_FIELD_DESC);
oprot.writeI64(struct.originalEntityCreationTime);
oprot.writeFieldEnd();
}
- if (struct.isSetSharedCount()) {
- oprot.writeFieldBegin(SHARED_COUNT_FIELD_DESC);
- oprot.writeI64(struct.sharedCount);
- oprot.writeFieldEnd();
- }
if (struct.isSetCreatedTime()) {
oprot.writeFieldBegin(CREATED_TIME_FIELD_DESC);
oprot.writeI64(struct.createdTime);
@@ -1568,10 +1554,10 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
if (struct.isSetFullText()) {
optionals.set(8);
}
- if (struct.isSetOriginalEntityCreationTime()) {
+ if (struct.isSetSharedCount()) {
optionals.set(9);
}
- if (struct.isSetSharedCount()) {
+ if (struct.isSetOriginalEntityCreationTime()) {
optionals.set(10);
}
if (struct.isSetCreatedTime()) {
@@ -1608,12 +1594,12 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
if (struct.isSetFullText()) {
oprot.writeString(struct.fullText);
}
+ if (struct.isSetSharedCount()) {
+ oprot.writeI32(struct.sharedCount);
+ }
if (struct.isSetOriginalEntityCreationTime()) {
oprot.writeI64(struct.originalEntityCreationTime);
}
- if (struct.isSetSharedCount()) {
- oprot.writeI64(struct.sharedCount);
- }
if (struct.isSetCreatedTime()) {
oprot.writeI64(struct.createdTime);
}
@@ -1663,12 +1649,12 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
struct.setFullTextIsSet(true);
}
if (incoming.get(9)) {
- struct.originalEntityCreationTime = iprot.readI64();
- struct.setOriginalEntityCreationTimeIsSet(true);
+ struct.sharedCount = iprot.readI32();
+ struct.setSharedCountIsSet(true);
}
if (incoming.get(10)) {
- struct.sharedCount = iprot.readI64();
- struct.setSharedCountIsSet(true);
+ struct.originalEntityCreationTime = iprot.readI64();
+ struct.setOriginalEntityCreationTimeIsSet(true);
}
if (incoming.get(11)) {
struct.createdTime = iprot.readI64();
http://git-wip-us.apache.org/repos/asf/airavata/blob/a135c82e/modules/sharing-registry/sharing-service-docs/api-docs/sharing_models.html
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-service-docs/api-docs/sharing_models.html b/modules/sharing-registry/sharing-service-docs/api-docs/sharing_models.html
index a696382..e49d79e 100644
--- a/modules/sharing-registry/sharing-service-docs/api-docs/sharing_models.html
+++ b/modules/sharing-registry/sharing-service-docs/api-docs/sharing_models.html
@@ -241,16 +241,23 @@ regarding the user.</p>
<tr><td>7</td><td>description</td><td><code>string</code></td><td></td><td>optional</td><td></td></tr>
<tr><td>8</td><td>binaryData</td><td><code>binary</code></td><td></td><td>optional</td><td></td></tr>
<tr><td>9</td><td>fullText</td><td><code>string</code></td><td></td><td>optional</td><td></td></tr>
-<tr><td>10</td><td>originalEntityCreationTime</td><td><code>i64</code></td><td></td><td>optional</td><td></td></tr>
<tr>
- <td>11</td>
+ <td>10</td>
<td>sharedCount</td>
- <td><code>i64</code></td>
+ <td><code>i32</code></td>
<td></td>
<td>optional</td>
<td><code>0</code></td>
</tr>
<tr>
+ <td>11</td>
+ <td>originalEntityCreationTime</td>
+ <td><code>i64</code></td>
+ <td></td>
+ <td>optional</td>
+ <td></td>
+ </tr>
+ <tr>
<td>12</td>
<td>createdTime</td>
<td><code>i64</code></td>
http://git-wip-us.apache.org/repos/asf/airavata/blob/a135c82e/modules/sharing-registry/thrift_models/sharing_models.thrift
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/thrift_models/sharing_models.thrift b/modules/sharing-registry/thrift_models/sharing_models.thrift
index 2459954..977a1fd 100644
--- a/modules/sharing-registry/thrift_models/sharing_models.thrift
+++ b/modules/sharing-registry/thrift_models/sharing_models.thrift
@@ -222,8 +222,8 @@ struct Entity {
7: optional string description,
8: optional binary binaryData,
9: optional string fullText,
- 10: optional i64 originalEntityCreationTime,
- 11: optional i64 sharedCount = 0,
+ 10: optional i32 sharedCount = 0,
+ 11: optional i64 originalEntityCreationTime,
12: optional i64 createdTime,
13: optional i64 updatedTime
}
[23/50] airavata git commit: Merge branch 'db-migrate-scripts' of
https://github.com/anujbhan/airavata into develop
Posted by sm...@apache.org.
Merge branch 'db-migrate-scripts' of https://github.com/anujbhan/airavata into develop
This closes #102
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/28b488db
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/28b488db
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/28b488db
Branch: refs/heads/master
Commit: 28b488dbf42722194421555cf3998386aeca4321
Parents: ed6cbf6 7cf48b3
Author: Marcus Christie <ma...@apache.org>
Authored: Mon Mar 20 09:37:20 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Mon Mar 20 09:37:20 2017 -0400
----------------------------------------------------------------------
.../DeltaScripts/appCatalog_schema_delta.sql | 64 ++++++++++++++++++++
.../credentialStore_schema_delta.sql | 17 ++++++
.../DeltaScripts/expCatalog_schema_delta.sql | 34 +++++++++++
.../replicaCatalog_schema_delta.sql | 12 ++++
.../DeltaScripts/workFlow_schema_delta.sql | 11 ++++
.../0.16-0.17/migration-notes.md | 10 +++
6 files changed, 148 insertions(+)
----------------------------------------------------------------------
[06/50] airavata git commit: AIRAVATA-2335 Updating README
Posted by sm...@apache.org.
AIRAVATA-2335 Updating README
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f9eb7bc7
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f9eb7bc7
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f9eb7bc7
Branch: refs/heads/master
Commit: f9eb7bc70da5179ed8ab586064d5ca94932982ef
Parents: 2a41071
Author: Marcus Christie <ma...@apache.org>
Authored: Thu Mar 9 12:09:00 2017 -0500
Committer: Marcus Christie <ma...@apache.org>
Committed: Thu Mar 9 12:09:00 2017 -0500
----------------------------------------------------------------------
dev-tools/ansible/README.md | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/f9eb7bc7/dev-tools/ansible/README.md
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/README.md b/dev-tools/ansible/README.md
index aa72e4e..f2b8a6c 100644
--- a/dev-tools/ansible/README.md
+++ b/dev-tools/ansible/README.md
@@ -22,13 +22,13 @@ There are ansible roles to install Airavata pre-requisites (RabbitMQ, Zookeeper,
## Useful commands
-- `ansible-playbook -i hosts site.yml`
-- `ansible-playbook -i hosts site.yml -t "tags"`
-- `ansible-playbook -i hosts site.yml --start-at-task="name of the ansible task"`
+- `ansible-playbook -i inventories/develop site.yml`
+- `ansible-playbook -i inventories/develop site.yml -t "tags"`
+- `ansible-playbook -i inventories/develop site.yml --start-at-task="name of the ansible task"`
To deploy pga run following. see site.yml (playbook) file for other available tags.
-- `ansible-playbook -i hosts site.yml -t "pga"`
+- `ansible-playbook -i inventories/develop site.yml -t "pga"`
## Configurations
[22/50] airavata git commit: AIRAVATA-2335 Updating with Anuj's DB
info
Posted by sm...@apache.org.
AIRAVATA-2335 Updating with Anuj's DB info
Also deleting untested CentOS 6 PGA install script.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ed6cbf65
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ed6cbf65
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ed6cbf65
Branch: refs/heads/master
Commit: ed6cbf656dc1745e42463ef1af0ea053c8a86eae
Parents: 58c3d52
Author: Marcus Christie <ma...@apache.org>
Authored: Mon Mar 20 09:35:50 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Mon Mar 20 09:35:50 2017 -0400
----------------------------------------------------------------------
.../inventories/testing-0.17/group_vars/all.yml | 91 --------------------
.../testing-0.17/group_vars/all/vars.yml | 91 ++++++++++++++++++++
.../ansible/inventories/testing-0.17/hosts | 2 +-
.../roles/pga/tasks/install_deps_CentOS_6.yml | 33 -------
4 files changed, 92 insertions(+), 125 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed6cbf65/dev-tools/ansible/inventories/testing-0.17/group_vars/all.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17/group_vars/all.yml b/dev-tools/ansible/inventories/testing-0.17/group_vars/all.yml
deleted file mode 100644
index 6818d31..0000000
--- a/dev-tools/ansible/inventories/testing-0.17/group_vars/all.yml
+++ /dev/null
@@ -1,91 +0,0 @@
----
-
-user: centos
-group: centos
-user_home: "/home/{{ user }}"
-
-# deployment related variables
-deployment_dir: "{{ user_home }}/deployment"
-airavata_source_dir: "{{ user_home }}/source"
-airavata_repo: "https://git-wip-us.apache.org/repos/asf/airavata.git"
-airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
-airavata_dist_name: "{{ airavata_dist }}-bin.tar.gz"
-old_airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
-git_branch: develop
-
-# Database related variables
-db_server: "{{ groups['database'][0] }}"
-db_server_port: "3306"
-db_user: "airavata"
-db_password: "airavata"
-app_catalog: "app_catalog"
-exp_catalog: "exp_catalog"
-replica_catalog: "replica_catalog"
-sharing_catalog: "sharing_catalog"
-workflow_catalog: "wf_catalog"
-credential_store: "credential_store"
-
-mysql_connector_jar: "mysql-connector-java-5.1.37-bin.jar"
-
-# Rabbitmq related vareables
-rabbitmq_server: "{{ ansible_fqdn }}"
-rabbitmq_vhost: "develop"
-rabbitmq_user: "airavata"
-rabbitmq_password: "airavata"
-rabbitmq_port: "5672"
-rabbitmq_broker_url: "amqp://{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ rabbitmq_server}}:{{ rabbitmq_port }}/{{ rabbitmq_vhost }}"
-
-# Zoookeeper related variables
-zookeeper_client_port: 2181
-zookeeper_url: "{{ groups['zookeeper'][0] }}:{{ zookeeper_client_port }}"
-# API Server related variables
-api_server_name: "apiserver-node0"
-api_server_host: "{{ansible_fqdn}}"
-api_server_port: "8930"
-api_secured: "false"
-tls_enable: "false"
-api_server_tls_port: "9930"
-enable_sharing: "true"
-
-# Orchestrator related variables
-orchestrator_name: "orchestrator-node0"
-orchestrator_host: "{{ansible_fqdn}}"
-orchestrator_port: "8940"
-api_orch_dir: "{{ deployment_dir }}/api-orchestrator"
-api_orch_server_names: "api-orch"
-
-# registry related variables
-registry_name: regserver-node0
-registry_host: "{{ ansible_fqdn }}"
-registry_port: 8970
-#registry_dir: "{{ deployment_dir }}/registry"
-default_gateway: "php_reference_gateway"
-
-# Credential and keystore related variables
-#authorization_server: "https://{{ groups['wso2is'][0]}}:9443/services/"
-authorization_server: "https://idp.scigap.org:9443/services/"
-keystore: "airavata.jks"
-keystore_passwd: "airavata"
-#client_truststore: "client_truststore.jks"
-client_truststore: "airavata.jks"
-client_truststore_passwd: "airavata"
-cred_keystore: "airavata_sym.jks"
-cred_keystore_passwd: "airavata"
-cred_keystore_alias: "airavata"
-cred_store_server_host: "{{ ansible_fqdn }}"
-cred_store_port: "8960"
-keystores_location: "{{ deployment_dir }}/keystores"
-
-# Gfac related variables
-gfac_name: "gfac-node0"
-gfac_host: "{{ ansible_fqdn }}"
-gfac_port: "8950"
-gfac_dir: "{{ deployment_dir }}/gfac-instance"
-
-# Monitoring variables
-monitor_email_address: "test.airavata@gmail.com"
-monitor_email_password: "airavata"
-
-# Sharing Registry related variables
-sharing_registry_host: "{{ ansible_fqdn }}"
-sharing_registry_port: 7878
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed6cbf65/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vars.yml b/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vars.yml
new file mode 100644
index 0000000..408a77b
--- /dev/null
+++ b/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vars.yml
@@ -0,0 +1,91 @@
+---
+
+user: centos
+group: centos
+user_home: "/home/{{ user }}"
+
+# deployment related variables
+deployment_dir: "{{ user_home }}/deployment"
+airavata_source_dir: "{{ user_home }}/source"
+airavata_repo: "https://git-wip-us.apache.org/repos/asf/airavata.git"
+airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
+airavata_dist_name: "{{ airavata_dist }}-bin.tar.gz"
+old_airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
+git_branch: develop
+
+# Database related variables
+db_server: "{{ groups['database'][0] }}"
+db_server_port: "3306"
+db_user: "airavata"
+db_password: "{{ vault_db_password }}"
+app_catalog: "app_catalog"
+exp_catalog: "exp_catalog"
+replica_catalog: "replica_catalog"
+sharing_catalog: "sharing_catalog"
+workflow_catalog: "wf_catalog"
+credential_store: "credential_store"
+
+mysql_connector_jar: "mysql-connector-java-5.1.37-bin.jar"
+
+# Rabbitmq related vareables
+rabbitmq_server: "{{ ansible_fqdn }}"
+rabbitmq_vhost: "develop"
+rabbitmq_user: "airavata"
+rabbitmq_password: "airavata"
+rabbitmq_port: "5672"
+rabbitmq_broker_url: "amqp://{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ rabbitmq_server}}:{{ rabbitmq_port }}/{{ rabbitmq_vhost }}"
+
+# Zoookeeper related variables
+zookeeper_client_port: 2181
+zookeeper_url: "{{ groups['zookeeper'][0] }}:{{ zookeeper_client_port }}"
+# API Server related variables
+api_server_name: "apiserver-node0"
+api_server_host: "{{ansible_fqdn}}"
+api_server_port: "8930"
+api_secured: "false"
+tls_enable: "false"
+api_server_tls_port: "9930"
+enable_sharing: "true"
+
+# Orchestrator related variables
+orchestrator_name: "orchestrator-node0"
+orchestrator_host: "{{ansible_fqdn}}"
+orchestrator_port: "8940"
+api_orch_dir: "{{ deployment_dir }}/api-orchestrator"
+api_orch_server_names: "api-orch"
+
+# registry related variables
+registry_name: regserver-node0
+registry_host: "{{ ansible_fqdn }}"
+registry_port: 8970
+#registry_dir: "{{ deployment_dir }}/registry"
+default_gateway: "php_reference_gateway"
+
+# Credential and keystore related variables
+#authorization_server: "https://{{ groups['wso2is'][0]}}:9443/services/"
+authorization_server: "https://idp.scigap.org:9443/services/"
+keystore: "airavata.jks"
+keystore_passwd: "airavata"
+#client_truststore: "client_truststore.jks"
+client_truststore: "airavata.jks"
+client_truststore_passwd: "airavata"
+cred_keystore: "airavata_sym.jks"
+cred_keystore_passwd: "airavata"
+cred_keystore_alias: "airavata"
+cred_store_server_host: "{{ ansible_fqdn }}"
+cred_store_port: "8960"
+keystores_location: "{{ deployment_dir }}/keystores"
+
+# Gfac related variables
+gfac_name: "gfac-node0"
+gfac_host: "{{ ansible_fqdn }}"
+gfac_port: "8950"
+gfac_dir: "{{ deployment_dir }}/gfac-instance"
+
+# Monitoring variables
+monitor_email_address: "test.airavata@gmail.com"
+monitor_email_password: "airavata"
+
+# Sharing Registry related variables
+sharing_registry_host: "{{ ansible_fqdn }}"
+sharing_registry_port: 7878
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed6cbf65/dev-tools/ansible/inventories/testing-0.17/hosts
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17/hosts b/dev-tools/ansible/inventories/testing-0.17/hosts
index ce939fb..80b186e 100644
--- a/dev-tools/ansible/inventories/testing-0.17/hosts
+++ b/dev-tools/ansible/inventories/testing-0.17/hosts
@@ -5,7 +5,7 @@
149.165.168.5 ansible_user=centos
[database]
-149.165.168.5 ansible_user=centos
+149.165.172.163 ansible_user=centos
[api-orch]
149.165.168.5 ansible_user=centos
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed6cbf65/dev-tools/ansible/roles/pga/tasks/install_deps_CentOS_6.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/tasks/install_deps_CentOS_6.yml b/dev-tools/ansible/roles/pga/tasks/install_deps_CentOS_6.yml
deleted file mode 100644
index 8da9aa3..0000000
--- a/dev-tools/ansible/roles/pga/tasks/install_deps_CentOS_6.yml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-
-- name: Install pre-requisites
- yum: name="{{ item }}" state=latest update_cache=yes
- with_items:
- - git
- - httpd
- - php
- - php-soap
- - libselinux-python
- - php-pdo
- become: yes
-#"
-
-# - name: Allow selinux outbound connection from web server
- # command: setsebool -P httpd_can_network_connect 1
-
-- name: install composer
- shell: curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
- args:
- creates: /usr/local/bin/composer
- become: yes
-
-- name: install epel release
- yum: name=epel-release state=present
- become: yes
-
-#OS_dep
-# depend on epel release
-- name: install mcrypt
- yum: name=php-mcrypt state=latest update_cache=yes
- become: yes
-
[32/50] airavata git commit: merging remote branch
Posted by sm...@apache.org.
merging remote branch
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/3a0b0613
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/3a0b0613
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/3a0b0613
Branch: refs/heads/master
Commit: 3a0b06132abe10504dd692d51a09aadabf601dfb
Parents: 38dc897 058cf70
Author: scnakandala <su...@gmail.com>
Authored: Wed Mar 22 14:56:54 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Mar 22 14:56:54 2017 -0400
----------------------------------------------------------------------
.../ansible/inventories/geogateway-dev/group_vars/pga/vars.yml | 5 ++---
dev-tools/ansible/inventories/geogateway-dev/hosts | 2 +-
.../inventories/testing-0.17-scigap/group_vars/pga/vars.yml | 2 +-
.../inventories/testing-0.17-testdrive/group_vars/pga/vars.yml | 2 +-
.../ansible/inventories/testing-0.17/group_vars/pga/vars.yml | 2 +-
5 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[43/50] airavata git commit: AIRAVATA-2347 Removing code for old
project sharing impl
Posted by sm...@apache.org.
AIRAVATA-2347 Removing code for old project sharing impl
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/9b4c9682
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/9b4c9682
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/9b4c9682
Branch: refs/heads/master
Commit: 9b4c9682b13aeb437db51382bba8621622046fe2
Parents: 8c6f18c
Author: Marcus Christie <ma...@apache.org>
Authored: Mon Mar 27 15:15:42 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Mon Mar 27 15:15:42 2017 -0400
----------------------------------------------------------------------
.../catalog/impl/ProjectRegistry.java | 34 --------------------
1 file changed, 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/9b4c9682/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ProjectRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ProjectRegistry.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ProjectRegistry.java
index 9e16daa..9e32ef3 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ProjectRegistry.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ProjectRegistry.java
@@ -76,23 +76,6 @@ public class ProjectRegistry {
resource.setProjectId(project.getProjectID());
resource.setUserName(project.getOwner());
resource.save();
- List<String> sharedGroups = project.getSharedGroups();
- if (sharedGroups != null && !sharedGroups.isEmpty()){
- for (String group : sharedGroups){
- //TODO - add shared groups
- logger.info("Groups are not supported at the moment...");
- }
- }
-
- List<String> sharedUsers = project.getSharedUsers();
- if (sharedUsers != null && !sharedUsers.isEmpty()){
- for (String username : sharedUsers){
- ProjectUserResource pr = (ProjectUserResource)projectResource.
- create(ResourceType.PROJECT_USER);
- pr.setUserName(username);
- pr.save();
- }
- }
}catch (Exception e){
logger.error("Error while saving project to registry", e);
throw new RegistryException(e);
@@ -126,23 +109,6 @@ public class ProjectRegistry {
resource.setProjectId(projectId);
resource.setUserName(project.getOwner());
resource.save();
- List<String> sharedGroups = project.getSharedGroups();
- if (sharedGroups != null && !sharedGroups.isEmpty()){
- for (String group : sharedGroups){
- //TODO - add shared groups
- logger.info("Groups are not supported at the moment...");
- }
- }
-
- List<String> sharedUsers = project.getSharedUsers();
- if (sharedUsers != null && !sharedUsers.isEmpty()){
- for (String username : sharedUsers){
- ProjectUserResource pr = (ProjectUserResource)existingProject.create(
- ResourceType.PROJECT_USER);
- pr.setUserName(username);
- pr.save();
- }
- }
}catch (Exception e){
logger.error("Error while saving project to registry", e);
throw new RegistryException(e);
[19/50] airavata git commit: AIRAVATA-2339 Use default key of user
resource profile
Posted by sm...@apache.org.
AIRAVATA-2339 Use default key of user resource profile
When the user hasn't set a resource specific key for compute or storage
preference, use the default one on the user resource profile
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/58c3d52b
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/58c3d52b
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/58c3d52b
Branch: refs/heads/master
Commit: 58c3d52b443e1cf9d5bf517ef8ccfdff6f25be57
Parents: 0c8c2ae
Author: Marcus Christie <ma...@apache.org>
Authored: Thu Mar 16 17:01:41 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Thu Mar 16 17:03:13 2017 -0400
----------------------------------------------------------------------
.../gfac/core/context/ProcessContext.java | 38 ++++++++++++--------
1 file changed, 24 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/58c3d52b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
index e057b71..153f0ee 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
@@ -447,26 +447,36 @@ public class ProcessContext {
}
public String getComputeResourceCredentialToken(){
- if (isUseUserCRPref() &&
- userComputeResourcePreference != null &&
- isValid(userComputeResourcePreference.getResourceSpecificCredentialStoreToken())) {
- return userComputeResourcePreference.getResourceSpecificCredentialStoreToken();
- } else if (isValid(gatewayComputeResourcePreference.getResourceSpecificCredentialStoreToken())) {
- return gatewayComputeResourcePreference.getResourceSpecificCredentialStoreToken();
+ if (isUseUserCRPref()) {
+ if (userComputeResourcePreference != null &&
+ isValid(userComputeResourcePreference.getResourceSpecificCredentialStoreToken())) {
+ return userComputeResourcePreference.getResourceSpecificCredentialStoreToken();
+ } else {
+ return userResourceProfile.getCredentialStoreToken();
+ }
} else {
- return gatewayResourceProfile.getCredentialStoreToken();
+ if (isValid(gatewayComputeResourcePreference.getResourceSpecificCredentialStoreToken())) {
+ return gatewayComputeResourcePreference.getResourceSpecificCredentialStoreToken();
+ } else {
+ return gatewayResourceProfile.getCredentialStoreToken();
+ }
}
}
public String getStorageResourceCredentialToken(){
- if (isUseUserCRPref() &&
- userStoragePreference != null &&
- isValid(userStoragePreference.getResourceSpecificCredentialStoreToken())) {
- return userStoragePreference.getResourceSpecificCredentialStoreToken();
- } else if (isValid(gatewayStorageResourcePreference.getResourceSpecificCredentialStoreToken())) {
- return gatewayStorageResourcePreference.getResourceSpecificCredentialStoreToken();
+ if (isUseUserCRPref()) {
+ if (userStoragePreference != null &&
+ isValid(userStoragePreference.getResourceSpecificCredentialStoreToken())) {
+ return userStoragePreference.getResourceSpecificCredentialStoreToken();
+ } else {
+ return userResourceProfile.getCredentialStoreToken();
+ }
} else {
- return gatewayResourceProfile.getCredentialStoreToken();
+ if (isValid(gatewayStorageResourcePreference.getResourceSpecificCredentialStoreToken())) {
+ return gatewayStorageResourcePreference.getResourceSpecificCredentialStoreToken();
+ } else {
+ return gatewayResourceProfile.getCredentialStoreToken();
+ }
}
}
[25/50] airavata git commit: AIRAVATA-2335 PGA inventories for
testing testdrive, scigap
Posted by sm...@apache.org.
AIRAVATA-2335 PGA inventories for testing testdrive, scigap
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2eb8f211
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2eb8f211
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2eb8f211
Branch: refs/heads/master
Commit: 2eb8f211743d376572da4af8ef775061cc4ae3f8
Parents: 3d308ab
Author: Marcus Christie <ma...@apache.org>
Authored: Mon Mar 20 10:19:32 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Mon Mar 20 10:19:32 2017 -0400
----------------------------------------------------------------------
.../testing-0.17-scigap/group_vars/all/vars.yml | 91 ++++++++++++++++++++
.../group_vars/all/vault.yml | 7 ++
.../testing-0.17-scigap/group_vars/pga/vars.yml | 32 +++++++
.../group_vars/pga/vault.yml | 18 ++++
.../inventories/testing-0.17-scigap/hosts | 23 +++++
.../group_vars/all/vars.yml | 91 ++++++++++++++++++++
.../group_vars/all/vault.yml | 7 ++
.../group_vars/pga/vars.yml | 32 +++++++
.../group_vars/pga/vault.yml | 18 ++++
.../inventories/testing-0.17-testdrive/hosts | 23 +++++
10 files changed, 342 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/2eb8f211/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/all/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/all/vars.yml b/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/all/vars.yml
new file mode 100644
index 0000000..408a77b
--- /dev/null
+++ b/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/all/vars.yml
@@ -0,0 +1,91 @@
+---
+
+user: centos
+group: centos
+user_home: "/home/{{ user }}"
+
+# deployment related variables
+deployment_dir: "{{ user_home }}/deployment"
+airavata_source_dir: "{{ user_home }}/source"
+airavata_repo: "https://git-wip-us.apache.org/repos/asf/airavata.git"
+airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
+airavata_dist_name: "{{ airavata_dist }}-bin.tar.gz"
+old_airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
+git_branch: develop
+
+# Database related variables
+db_server: "{{ groups['database'][0] }}"
+db_server_port: "3306"
+db_user: "airavata"
+db_password: "{{ vault_db_password }}"
+app_catalog: "app_catalog"
+exp_catalog: "exp_catalog"
+replica_catalog: "replica_catalog"
+sharing_catalog: "sharing_catalog"
+workflow_catalog: "wf_catalog"
+credential_store: "credential_store"
+
+mysql_connector_jar: "mysql-connector-java-5.1.37-bin.jar"
+
+# Rabbitmq related vareables
+rabbitmq_server: "{{ ansible_fqdn }}"
+rabbitmq_vhost: "develop"
+rabbitmq_user: "airavata"
+rabbitmq_password: "airavata"
+rabbitmq_port: "5672"
+rabbitmq_broker_url: "amqp://{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ rabbitmq_server}}:{{ rabbitmq_port }}/{{ rabbitmq_vhost }}"
+
+# Zoookeeper related variables
+zookeeper_client_port: 2181
+zookeeper_url: "{{ groups['zookeeper'][0] }}:{{ zookeeper_client_port }}"
+# API Server related variables
+api_server_name: "apiserver-node0"
+api_server_host: "{{ansible_fqdn}}"
+api_server_port: "8930"
+api_secured: "false"
+tls_enable: "false"
+api_server_tls_port: "9930"
+enable_sharing: "true"
+
+# Orchestrator related variables
+orchestrator_name: "orchestrator-node0"
+orchestrator_host: "{{ansible_fqdn}}"
+orchestrator_port: "8940"
+api_orch_dir: "{{ deployment_dir }}/api-orchestrator"
+api_orch_server_names: "api-orch"
+
+# registry related variables
+registry_name: regserver-node0
+registry_host: "{{ ansible_fqdn }}"
+registry_port: 8970
+#registry_dir: "{{ deployment_dir }}/registry"
+default_gateway: "php_reference_gateway"
+
+# Credential and keystore related variables
+#authorization_server: "https://{{ groups['wso2is'][0]}}:9443/services/"
+authorization_server: "https://idp.scigap.org:9443/services/"
+keystore: "airavata.jks"
+keystore_passwd: "airavata"
+#client_truststore: "client_truststore.jks"
+client_truststore: "airavata.jks"
+client_truststore_passwd: "airavata"
+cred_keystore: "airavata_sym.jks"
+cred_keystore_passwd: "airavata"
+cred_keystore_alias: "airavata"
+cred_store_server_host: "{{ ansible_fqdn }}"
+cred_store_port: "8960"
+keystores_location: "{{ deployment_dir }}/keystores"
+
+# Gfac related variables
+gfac_name: "gfac-node0"
+gfac_host: "{{ ansible_fqdn }}"
+gfac_port: "8950"
+gfac_dir: "{{ deployment_dir }}/gfac-instance"
+
+# Monitoring variables
+monitor_email_address: "test.airavata@gmail.com"
+monitor_email_password: "airavata"
+
+# Sharing Registry related variables
+sharing_registry_host: "{{ ansible_fqdn }}"
+sharing_registry_port: 7878
http://git-wip-us.apache.org/repos/asf/airavata/blob/2eb8f211/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
new file mode 100644
index 0000000..a1d18b5
--- /dev/null
+++ b/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/all/vault.yml
@@ -0,0 +1,7 @@
+$ANSIBLE_VAULT;1.1;AES256
+36666132643537623138323138316561383434336231643237303337623462313834323462656434
+6362663032643235363133613463616663643731316438340a636336316333386434303635303961
+64626364363465366538666538643037366431326533366562393765313631363434323230666665
+3230633265386131360a316232386666613664383561663231346466353065393435376537653631
+36663363353964336464653964393931346530343139313465303730316562613937636566623038
+3637393433373136343934313266653665346665323765373261
http://git-wip-us.apache.org/repos/asf/airavata/blob/2eb8f211/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
new file mode 100644
index 0000000..17080c5
--- /dev/null
+++ b/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/pga/vars.yml
@@ -0,0 +1,32 @@
+---
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+pga_git_branch: "develop"
+pga_user: "pga"
+pga_group: "pga"
+doc_root_dir: "/var/www/html/php-gateway"
+user_data_dir: "/var/www/user_data"
+#vhost_servername: "{{ groups['pga'][0] }}"
+
+## 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 }}"
+
+## Airavata Client related variables
+#airavata_server: "tls://gw77.iu.xsede.org"
+airavata_server: "{{ groups['api-orch'][0] }}"
+airavata_port: "8930"
+gateway_id: "scigap"
+# 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"
+
+## Portal related variables
+super_admin_portal: "true"
+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/2eb8f211/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
new file mode 100644
index 0000000..a30ba69
--- /dev/null
+++ b/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/pga/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/2eb8f211/dev-tools/ansible/inventories/testing-0.17-scigap/hosts
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17-scigap/hosts b/dev-tools/ansible/inventories/testing-0.17-scigap/hosts
new file mode 100644
index 0000000..b728b7b
--- /dev/null
+++ b/dev-tools/ansible/inventories/testing-0.17-scigap/hosts
@@ -0,0 +1,23 @@
+[zookeeper]
+149.165.168.5 ansible_user=centos
+
+[rabbitmq]
+149.165.168.5 ansible_user=centos
+
+[database]
+149.165.172.163 ansible_user=centos
+
+[api-orch]
+149.165.168.5 ansible_user=centos
+
+[gfac]
+149.165.168.5 ansible_user=centos
+
+# NOTE: the registry is NOT deployed separately from the API server, but some
+# of the playbooks assume that there is a 'registry' group, so this entry
+# needs to be here as a workaround
+[registry]
+149.165.168.5 ansible_user=centos
+
+[pga]
+149.165.156.52 ansible_user=centos
http://git-wip-us.apache.org/repos/asf/airavata/blob/2eb8f211/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/all/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/all/vars.yml b/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/all/vars.yml
new file mode 100644
index 0000000..408a77b
--- /dev/null
+++ b/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/all/vars.yml
@@ -0,0 +1,91 @@
+---
+
+user: centos
+group: centos
+user_home: "/home/{{ user }}"
+
+# deployment related variables
+deployment_dir: "{{ user_home }}/deployment"
+airavata_source_dir: "{{ user_home }}/source"
+airavata_repo: "https://git-wip-us.apache.org/repos/asf/airavata.git"
+airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
+airavata_dist_name: "{{ airavata_dist }}-bin.tar.gz"
+old_airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
+git_branch: develop
+
+# Database related variables
+db_server: "{{ groups['database'][0] }}"
+db_server_port: "3306"
+db_user: "airavata"
+db_password: "{{ vault_db_password }}"
+app_catalog: "app_catalog"
+exp_catalog: "exp_catalog"
+replica_catalog: "replica_catalog"
+sharing_catalog: "sharing_catalog"
+workflow_catalog: "wf_catalog"
+credential_store: "credential_store"
+
+mysql_connector_jar: "mysql-connector-java-5.1.37-bin.jar"
+
+# Rabbitmq related vareables
+rabbitmq_server: "{{ ansible_fqdn }}"
+rabbitmq_vhost: "develop"
+rabbitmq_user: "airavata"
+rabbitmq_password: "airavata"
+rabbitmq_port: "5672"
+rabbitmq_broker_url: "amqp://{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ rabbitmq_server}}:{{ rabbitmq_port }}/{{ rabbitmq_vhost }}"
+
+# Zoookeeper related variables
+zookeeper_client_port: 2181
+zookeeper_url: "{{ groups['zookeeper'][0] }}:{{ zookeeper_client_port }}"
+# API Server related variables
+api_server_name: "apiserver-node0"
+api_server_host: "{{ansible_fqdn}}"
+api_server_port: "8930"
+api_secured: "false"
+tls_enable: "false"
+api_server_tls_port: "9930"
+enable_sharing: "true"
+
+# Orchestrator related variables
+orchestrator_name: "orchestrator-node0"
+orchestrator_host: "{{ansible_fqdn}}"
+orchestrator_port: "8940"
+api_orch_dir: "{{ deployment_dir }}/api-orchestrator"
+api_orch_server_names: "api-orch"
+
+# registry related variables
+registry_name: regserver-node0
+registry_host: "{{ ansible_fqdn }}"
+registry_port: 8970
+#registry_dir: "{{ deployment_dir }}/registry"
+default_gateway: "php_reference_gateway"
+
+# Credential and keystore related variables
+#authorization_server: "https://{{ groups['wso2is'][0]}}:9443/services/"
+authorization_server: "https://idp.scigap.org:9443/services/"
+keystore: "airavata.jks"
+keystore_passwd: "airavata"
+#client_truststore: "client_truststore.jks"
+client_truststore: "airavata.jks"
+client_truststore_passwd: "airavata"
+cred_keystore: "airavata_sym.jks"
+cred_keystore_passwd: "airavata"
+cred_keystore_alias: "airavata"
+cred_store_server_host: "{{ ansible_fqdn }}"
+cred_store_port: "8960"
+keystores_location: "{{ deployment_dir }}/keystores"
+
+# Gfac related variables
+gfac_name: "gfac-node0"
+gfac_host: "{{ ansible_fqdn }}"
+gfac_port: "8950"
+gfac_dir: "{{ deployment_dir }}/gfac-instance"
+
+# Monitoring variables
+monitor_email_address: "test.airavata@gmail.com"
+monitor_email_password: "airavata"
+
+# Sharing Registry related variables
+sharing_registry_host: "{{ ansible_fqdn }}"
+sharing_registry_port: 7878
http://git-wip-us.apache.org/repos/asf/airavata/blob/2eb8f211/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
new file mode 100644
index 0000000..a1d18b5
--- /dev/null
+++ b/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/all/vault.yml
@@ -0,0 +1,7 @@
+$ANSIBLE_VAULT;1.1;AES256
+36666132643537623138323138316561383434336231643237303337623462313834323462656434
+6362663032643235363133613463616663643731316438340a636336316333386434303635303961
+64626364363465366538666538643037366431326533366562393765313631363434323230666665
+3230633265386131360a316232386666613664383561663231346466353065393435376537653631
+36663363353964336464653964393931346530343139313465303730316562613937636566623038
+3637393433373136343934313266653665346665323765373261
http://git-wip-us.apache.org/repos/asf/airavata/blob/2eb8f211/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
new file mode 100644
index 0000000..b32b50c
--- /dev/null
+++ b/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/pga/vars.yml
@@ -0,0 +1,32 @@
+---
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+pga_git_branch: "develop"
+pga_user: "pga"
+pga_group: "pga"
+doc_root_dir: "/var/www/html/php-gateway"
+user_data_dir: "/var/www/user_data"
+#vhost_servername: "{{ groups['pga'][0] }}"
+
+## 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 }}"
+
+## Airavata Client related variables
+#airavata_server: "tls://gw77.iu.xsede.org"
+airavata_server: "{{ groups['api-orch'][0] }}"
+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"
+
+## 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 }}"
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/2eb8f211/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
new file mode 100644
index 0000000..53570f3
--- /dev/null
+++ b/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/pga/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+61396665393731333432613331393939633062393863613563396331666232333863393432306336
+6535633534353532623634346238666437343761313430330a303039366262663334306264313733
+39656661373063353161633561303762303732323639656262633535303132383765393136663832
+3236623637343034660a653830323566653430313934383733363266393765633365663463333532
+36363863643635643734363434626566356131303664306239626538373237393532323965303136
+37343739306632633630343339336261363739313035363566356130386432386130316438646262
+30393939343336303733346436333766313830333036656262316234613038626138343838626665
+31303662616236616235366334643930346135386562663138383932643363363337333733623463
+64303438306666626666313736343037373564323536326637626636393565616261656236646139
+38393137343435663534663166306239633363306165323339303232303832316164636436323663
+35376331323533626438373633343731333463323665613037353431666162663737636236383736
+66373561356132303039663230313662333262306265363134333732396230346331643433383164
+33323161623439303933306466323036316366333464623161323265666238363730333465323761
+39663263393765363334323335393533336332353362386531653737363865333836353863663366
+65336433333362363362663935653561653438633738386130366539343565313735383530376465
+35666366373864313939306533343765313235643336613635393736353039633731383636643935
+30616338353238386638396332383038376466666632663737323239333934666138
http://git-wip-us.apache.org/repos/asf/airavata/blob/2eb8f211/dev-tools/ansible/inventories/testing-0.17-testdrive/hosts
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17-testdrive/hosts b/dev-tools/ansible/inventories/testing-0.17-testdrive/hosts
new file mode 100644
index 0000000..af2a0cc
--- /dev/null
+++ b/dev-tools/ansible/inventories/testing-0.17-testdrive/hosts
@@ -0,0 +1,23 @@
+[zookeeper]
+149.165.168.5 ansible_user=centos
+
+[rabbitmq]
+149.165.168.5 ansible_user=centos
+
+[database]
+149.165.172.163 ansible_user=centos
+
+[api-orch]
+149.165.168.5 ansible_user=centos
+
+[gfac]
+149.165.168.5 ansible_user=centos
+
+# NOTE: the registry is NOT deployed separately from the API server, but some
+# of the playbooks assume that there is a 'registry' group, so this entry
+# needs to be here as a workaround
+[registry]
+149.165.168.5 ansible_user=centos
+
+[pga]
+149.165.156.148 ansible_user=centos
[09/50] airavata git commit: adding sharedCount to entity table
Posted by sm...@apache.org.
adding sharedCount to entity table
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c6608d8f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c6608d8f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c6608d8f
Branch: refs/heads/master
Commit: c6608d8fe4045dc3cd0543d82f354e64313b367a
Parents: ebc158d
Author: scnakandala <su...@gmail.com>
Authored: Thu Mar 16 14:17:11 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Thu Mar 16 14:17:11 2017 -0400
----------------------------------------------------------------------
.../registry/db/entities/EntityEntity.java | 11 ++
.../db/repositories/EntityRepository.java | 5 +-
.../db/repositories/SharingRepository.java | 11 ++
.../sharing/registry/db/utils/DBConstants.java | 1 +
.../server/SharingRegistryServerHandler.java | 15 +++
.../main/resources/sharing-registry-derby.sql | 1 +
.../main/resources/sharing-registry-mysql.sql | 1 +
.../registry/SharingRegistryServiceTest.java | 9 +-
.../sharing/registry/models/Entity.java | 134 ++++++++++++++++---
.../api-docs/sharing_models.html | 26 +++-
.../thrift_models/sharing_models.thrift | 5 +-
11 files changed, 195 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/c6608d8f/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java
index a6090e4..dba36f2 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java
@@ -41,6 +41,7 @@ public class EntityEntity {
private ByteBuffer binaryData;
private String fullText;
private Long originalEntityCreationTime;
+ private int sharedCount;
private Long createdTime;
private Long updatedTime;
@@ -145,6 +146,16 @@ public class EntityEntity {
}
@Basic
+ @Column(name = "SHARED")
+ public int getSharedCount() {
+ return sharedCount;
+ }
+
+ public void setSharedCount(int sharedCount) {
+ this.sharedCount = sharedCount;
+ }
+
+ @Basic
@Column(name = "CREATED_TIME")
public Long getCreatedTime() {
return createdTime;
http://git-wip-us.apache.org/repos/asf/airavata/blob/c6608d8f/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
index d713124..577d17e 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
@@ -146,8 +146,9 @@ public class EntityRepository extends AbstractRepository<Entity, EntityEntity, E
entity.setBinaryData((byte[]) (rs[7]));
entity.setFullText((String) (rs[8]));
entity.setOriginalEntityCreationTime((long)(rs[9]));
- entity.setCreatedTime((long)(rs[10]));
- entity.setUpdatedTime((long)(rs[11]));
+ entity.setSharedCount((int) rs[10]);
+ entity.setCreatedTime((long) (rs[11]));
+ entity.setUpdatedTime((long) (rs[12]));
//Removing duplicates. Another option is to change the query to remove duplicates.
if (!keys.containsKey(entity + domainId + "," + entity.entityId)) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/c6608d8f/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/SharingRepository.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/SharingRepository.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/SharingRepository.java
index 7845fb1..66dd545 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/SharingRepository.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/SharingRepository.java
@@ -80,4 +80,15 @@ public class SharingRepository extends AbstractRepository<Sharing, SharingEntity
query += " ORDER BY p.createdTime DESC";
return select(query, 0, -1).size() > 0;
}
+
+ public int getSharedCount(String domainId, String entityId) throws SharingRegistryException {
+ String query = "SELECT p from " + SharingEntity.class.getSimpleName() + " as p";
+ query += " WHERE ";
+ query += "p." + DBConstants.SharingTable.DOMAIN_ID + " = '" + domainId + "' AND ";
+ query += "p." + DBConstants.SharingTable.ENTITY_ID + " = '" + entityId + "' AND ";
+ String permissionTypeIdString = (new PermissionTypeRepository()).getOwnerPermissionTypeIdForDomain(domainId);
+ query += "p." + DBConstants.SharingTable.PERMISSION_TYPE_ID + " <> '" + permissionTypeIdString + "' AND ";
+ query += "p." + DBConstants.SharingTable.SHARING_TYPE + " <> '" + SharingType.INDIRECT_CASCADING + "'";
+ return select(query, 0, -1).size();
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/c6608d8f/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/DBConstants.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/DBConstants.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/DBConstants.java
index b269ce1..e61c41d 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/DBConstants.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/DBConstants.java
@@ -91,6 +91,7 @@ public class DBConstants {
public static final String UPDATED_TIME = "updatedTime";
public static final String DOMAIN_ID = "domainId";
public static final String ORIGINAL_ENTITY_CREATION_TIME = "originalEntityCreationTime";
+ public static final String SHARED = "shared";
}
public static class SharingTable {
http://git-wip-us.apache.org/repos/asf/airavata/blob/c6608d8f/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
index 6fb2a12..c1ec8dd 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
@@ -738,6 +738,7 @@ public class SharingRegistryServerHandler implements SharingRegistryService.Ifac
Entity oldEntity = (new EntityRepository()).get(entityPK);
entity.setCreatedTime(oldEntity.createdTime);
entity = getUpdatedObject(oldEntity, entity);
+ entity.setSharedCount((new SharingRepository()).getSharedCount(entity.domainId, entity.entityId));
(new EntityRepository()).update(entity);
return true;
}catch (SharingRegistryException ex) {
@@ -905,6 +906,13 @@ public class SharingRegistryServerHandler implements SharingRegistryService.Ifac
}
}
(new SharingRepository()).create(sharings);
+
+ EntityPK entityPK = new EntityPK();
+ entityPK.setDomainId(domainId);
+ entityPK.setEntityId(entityId);
+ Entity entity = (new EntityRepository()).get(entityPK);
+ entity.setSharedCount((new SharingRepository()).getSharedCount(domainId, entityId));
+ (new EntityRepository()).update(entity);
return true;
}catch (SharingRegistryException ex) {
logger.error(ex.getMessage(), ex);
@@ -989,6 +997,13 @@ public class SharingRegistryServerHandler implements SharingRegistryService.Ifac
(new SharingRepository()).delete(sharingPK);
}
}
+
+ EntityPK entityPK = new EntityPK();
+ entityPK.setDomainId(domainId);
+ entityPK.setEntityId(entityId);
+ Entity entity = (new EntityRepository()).get(entityPK);
+ entity.setSharedCount((new SharingRepository()).getSharedCount(domainId, entityId));
+ (new EntityRepository()).update(entity);
return true;
}catch (SharingRegistryException ex) {
logger.error(ex.getMessage(), ex);
http://git-wip-us.apache.org/repos/asf/airavata/blob/c6608d8f/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql b/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql
index 83ef3f3..947742f 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql
+++ b/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql
@@ -102,6 +102,7 @@ CREATE TABLE ENTITY (
BINARY_DATA BLOB,
FULL_TEXT VARCHAR(255),
ORIGINAL_ENTITY_CREATION_TIME BIGINT NOT NULL,
+ SHARED_COUNT INT DEFAULT 0,
CREATED_TIME BIGINT NOT NULL,
UPDATED_TIME BIGINT NOT NULL,
PRIMARY KEY (ENTITY_ID, DOMAIN_ID),
http://git-wip-us.apache.org/repos/asf/airavata/blob/c6608d8f/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-mysql.sql b/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-mysql.sql
index d4ec07c..a90ff81 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-mysql.sql
+++ b/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-mysql.sql
@@ -102,6 +102,7 @@ CREATE TABLE ENTITY (
BINARY_DATA BLOB,
FULL_TEXT TEXT,
ORIGINAL_ENTITY_CREATION_TIME BIGINT NOT NULL,
+ SHARED_COUNT INT DEFAULT 0,
CREATED_TIME BIGINT NOT NULL,
UPDATED_TIME BIGINT NOT NULL,
PRIMARY KEY (ENTITY_ID, DOMAIN_ID),
http://git-wip-us.apache.org/repos/asf/airavata/blob/c6608d8f/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java b/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java
index ad5e9f3..112500e 100644
--- a/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java
+++ b/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java
@@ -28,7 +28,6 @@ import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.transport.TSocket;
import org.apache.thrift.transport.TTransport;
-import org.databene.contiperf.PerfTest;
import org.databene.contiperf.junit.ContiPerfRule;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -55,7 +54,7 @@ public class SharingRegistryServiceTest {
@Test
- @PerfTest(invocations = 50, threads = 10)
+// @PerfTest(invocations = 50, threads = 10)
public void test() throws TException, InterruptedException {
String serverHost = "localhost";
int serverPort = 7878;
@@ -278,7 +277,13 @@ public class SharingRegistryServiceTest {
entity4.setFullText("test input file 1 for experiment 2");
sharingServiceClient.createEntity(entity4);
+ Assert.assertTrue(sharingServiceClient.getEntity(domainId, "test-project-1").getSharedCount() == 0);
sharingServiceClient.shareEntityWithUsers(domainId, "test-project-1", Arrays.asList("test-user-2"), "WRITE", true);
+ Assert.assertTrue(sharingServiceClient.getEntity(domainId, "test-project-1").getSharedCount() == 1);
+ sharingServiceClient.revokeEntitySharingFromUsers(domainId, "test-project-1", Arrays.asList("test-user-2"), "WRITE");
+ Assert.assertTrue(sharingServiceClient.getEntity(domainId, "test-project-1").getSharedCount() == 0);
+ sharingServiceClient.shareEntityWithUsers(domainId, "test-project-1", Arrays.asList("test-user-2"), "WRITE", true);
+
sharingServiceClient.shareEntityWithGroups(domainId, "test-experiment-2", Arrays.asList("test-group-2"), "READ", true);
sharingServiceClient.shareEntityWithGroups(domainId, "test-experiment-2", Arrays.asList("test-group-2"), "CLONE", false);
http://git-wip-us.apache.org/repos/asf/airavata/blob/c6608d8f/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java
index c7bc3e1..8b8a83c 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java
@@ -65,8 +65,9 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
private static final org.apache.thrift.protocol.TField BINARY_DATA_FIELD_DESC = new org.apache.thrift.protocol.TField("binaryData", org.apache.thrift.protocol.TType.STRING, (short)8);
private static final org.apache.thrift.protocol.TField FULL_TEXT_FIELD_DESC = new org.apache.thrift.protocol.TField("fullText", org.apache.thrift.protocol.TType.STRING, (short)9);
private static final org.apache.thrift.protocol.TField ORIGINAL_ENTITY_CREATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("originalEntityCreationTime", org.apache.thrift.protocol.TType.I64, (short)10);
- private static final org.apache.thrift.protocol.TField CREATED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("createdTime", org.apache.thrift.protocol.TType.I64, (short)11);
- private static final org.apache.thrift.protocol.TField UPDATED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("updatedTime", org.apache.thrift.protocol.TType.I64, (short)12);
+ private static final org.apache.thrift.protocol.TField SHARED_COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("sharedCount", org.apache.thrift.protocol.TType.I64, (short)11);
+ private static final org.apache.thrift.protocol.TField CREATED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("createdTime", org.apache.thrift.protocol.TType.I64, (short)12);
+ private static final org.apache.thrift.protocol.TField UPDATED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("updatedTime", org.apache.thrift.protocol.TType.I64, (short)13);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -84,6 +85,7 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
public ByteBuffer binaryData; // optional
public String fullText; // optional
public long originalEntityCreationTime; // optional
+ public long sharedCount; // optional
public long createdTime; // optional
public long updatedTime; // optional
@@ -99,8 +101,9 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
BINARY_DATA((short)8, "binaryData"),
FULL_TEXT((short)9, "fullText"),
ORIGINAL_ENTITY_CREATION_TIME((short)10, "originalEntityCreationTime"),
- CREATED_TIME((short)11, "createdTime"),
- UPDATED_TIME((short)12, "updatedTime");
+ SHARED_COUNT((short)11, "sharedCount"),
+ CREATED_TIME((short)12, "createdTime"),
+ UPDATED_TIME((short)13, "updatedTime");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -135,9 +138,11 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return FULL_TEXT;
case 10: // ORIGINAL_ENTITY_CREATION_TIME
return ORIGINAL_ENTITY_CREATION_TIME;
- case 11: // CREATED_TIME
+ case 11: // SHARED_COUNT
+ return SHARED_COUNT;
+ case 12: // CREATED_TIME
return CREATED_TIME;
- case 12: // UPDATED_TIME
+ case 13: // UPDATED_TIME
return UPDATED_TIME;
default:
return null;
@@ -180,10 +185,11 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
// isset id assignments
private static final int __ORIGINALENTITYCREATIONTIME_ISSET_ID = 0;
- private static final int __CREATEDTIME_ISSET_ID = 1;
- private static final int __UPDATEDTIME_ISSET_ID = 2;
+ private static final int __SHAREDCOUNT_ISSET_ID = 1;
+ private static final int __CREATEDTIME_ISSET_ID = 2;
+ private static final int __UPDATEDTIME_ISSET_ID = 3;
private byte __isset_bitfield = 0;
- private static final _Fields optionals[] = {_Fields.ENTITY_ID,_Fields.DOMAIN_ID,_Fields.ENTITY_TYPE_ID,_Fields.OWNER_ID,_Fields.PARENT_ENTITY_ID,_Fields.NAME,_Fields.DESCRIPTION,_Fields.BINARY_DATA,_Fields.FULL_TEXT,_Fields.ORIGINAL_ENTITY_CREATION_TIME,_Fields.CREATED_TIME,_Fields.UPDATED_TIME};
+ private static final _Fields optionals[] = {_Fields.ENTITY_ID,_Fields.DOMAIN_ID,_Fields.ENTITY_TYPE_ID,_Fields.OWNER_ID,_Fields.PARENT_ENTITY_ID,_Fields.NAME,_Fields.DESCRIPTION,_Fields.BINARY_DATA,_Fields.FULL_TEXT,_Fields.ORIGINAL_ENTITY_CREATION_TIME,_Fields.SHARED_COUNT,_Fields.CREATED_TIME,_Fields.UPDATED_TIME};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -207,6 +213,8 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.ORIGINAL_ENTITY_CREATION_TIME, new org.apache.thrift.meta_data.FieldMetaData("originalEntityCreationTime", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+ tmpMap.put(_Fields.SHARED_COUNT, new org.apache.thrift.meta_data.FieldMetaData("sharedCount", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
tmpMap.put(_Fields.CREATED_TIME, new org.apache.thrift.meta_data.FieldMetaData("createdTime", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
tmpMap.put(_Fields.UPDATED_TIME, new org.apache.thrift.meta_data.FieldMetaData("updatedTime", org.apache.thrift.TFieldRequirementType.OPTIONAL,
@@ -216,6 +224,8 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
}
public Entity() {
+ this.sharedCount = 0L;
+
}
/**
@@ -251,6 +261,7 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
this.fullText = other.fullText;
}
this.originalEntityCreationTime = other.originalEntityCreationTime;
+ this.sharedCount = other.sharedCount;
this.createdTime = other.createdTime;
this.updatedTime = other.updatedTime;
}
@@ -272,6 +283,8 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
this.fullText = null;
setOriginalEntityCreationTimeIsSet(false);
this.originalEntityCreationTime = 0;
+ this.sharedCount = 0L;
+
setCreatedTimeIsSet(false);
this.createdTime = 0;
setUpdatedTimeIsSet(false);
@@ -527,6 +540,29 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
__isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ORIGINALENTITYCREATIONTIME_ISSET_ID, value);
}
+ public long getSharedCount() {
+ return this.sharedCount;
+ }
+
+ public Entity setSharedCount(long sharedCount) {
+ this.sharedCount = sharedCount;
+ setSharedCountIsSet(true);
+ return this;
+ }
+
+ public void unsetSharedCount() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SHAREDCOUNT_ISSET_ID);
+ }
+
+ /** Returns true if field sharedCount is set (has been assigned a value) and false otherwise */
+ public boolean isSetSharedCount() {
+ return EncodingUtils.testBit(__isset_bitfield, __SHAREDCOUNT_ISSET_ID);
+ }
+
+ public void setSharedCountIsSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SHAREDCOUNT_ISSET_ID, value);
+ }
+
public long getCreatedTime() {
return this.createdTime;
}
@@ -655,6 +691,14 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
}
break;
+ case SHARED_COUNT:
+ if (value == null) {
+ unsetSharedCount();
+ } else {
+ setSharedCount((Long)value);
+ }
+ break;
+
case CREATED_TIME:
if (value == null) {
unsetCreatedTime();
@@ -706,6 +750,9 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
case ORIGINAL_ENTITY_CREATION_TIME:
return getOriginalEntityCreationTime();
+ case SHARED_COUNT:
+ return getSharedCount();
+
case CREATED_TIME:
return getCreatedTime();
@@ -743,6 +790,8 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return isSetFullText();
case ORIGINAL_ENTITY_CREATION_TIME:
return isSetOriginalEntityCreationTime();
+ case SHARED_COUNT:
+ return isSetSharedCount();
case CREATED_TIME:
return isSetCreatedTime();
case UPDATED_TIME:
@@ -854,6 +903,15 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return false;
}
+ boolean this_present_sharedCount = true && this.isSetSharedCount();
+ boolean that_present_sharedCount = true && that.isSetSharedCount();
+ if (this_present_sharedCount || that_present_sharedCount) {
+ if (!(this_present_sharedCount && that_present_sharedCount))
+ return false;
+ if (this.sharedCount != that.sharedCount)
+ return false;
+ }
+
boolean this_present_createdTime = true && this.isSetCreatedTime();
boolean that_present_createdTime = true && that.isSetCreatedTime();
if (this_present_createdTime || that_present_createdTime) {
@@ -929,6 +987,11 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
if (present_originalEntityCreationTime)
list.add(originalEntityCreationTime);
+ boolean present_sharedCount = true && (isSetSharedCount());
+ list.add(present_sharedCount);
+ if (present_sharedCount)
+ list.add(sharedCount);
+
boolean present_createdTime = true && (isSetCreatedTime());
list.add(present_createdTime);
if (present_createdTime)
@@ -1050,6 +1113,16 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetSharedCount()).compareTo(other.isSetSharedCount());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetSharedCount()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sharedCount, other.sharedCount);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
lastComparison = Boolean.valueOf(isSetCreatedTime()).compareTo(other.isSetCreatedTime());
if (lastComparison != 0) {
return lastComparison;
@@ -1185,6 +1258,12 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
sb.append(this.originalEntityCreationTime);
first = false;
}
+ if (isSetSharedCount()) {
+ if (!first) sb.append(", ");
+ sb.append("sharedCount:");
+ sb.append(this.sharedCount);
+ first = false;
+ }
if (isSetCreatedTime()) {
if (!first) sb.append(", ");
sb.append("createdTime:");
@@ -1322,7 +1401,15 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 11: // CREATED_TIME
+ case 11: // SHARED_COUNT
+ if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+ struct.sharedCount = iprot.readI64();
+ struct.setSharedCountIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 12: // CREATED_TIME
if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
struct.createdTime = iprot.readI64();
struct.setCreatedTimeIsSet(true);
@@ -1330,7 +1417,7 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 12: // UPDATED_TIME
+ case 13: // UPDATED_TIME
if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
struct.updatedTime = iprot.readI64();
struct.setUpdatedTimeIsSet(true);
@@ -1421,6 +1508,11 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
oprot.writeI64(struct.originalEntityCreationTime);
oprot.writeFieldEnd();
}
+ if (struct.isSetSharedCount()) {
+ oprot.writeFieldBegin(SHARED_COUNT_FIELD_DESC);
+ oprot.writeI64(struct.sharedCount);
+ oprot.writeFieldEnd();
+ }
if (struct.isSetCreatedTime()) {
oprot.writeFieldBegin(CREATED_TIME_FIELD_DESC);
oprot.writeI64(struct.createdTime);
@@ -1479,13 +1571,16 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
if (struct.isSetOriginalEntityCreationTime()) {
optionals.set(9);
}
- if (struct.isSetCreatedTime()) {
+ if (struct.isSetSharedCount()) {
optionals.set(10);
}
- if (struct.isSetUpdatedTime()) {
+ if (struct.isSetCreatedTime()) {
optionals.set(11);
}
- oprot.writeBitSet(optionals, 12);
+ if (struct.isSetUpdatedTime()) {
+ optionals.set(12);
+ }
+ oprot.writeBitSet(optionals, 13);
if (struct.isSetEntityId()) {
oprot.writeString(struct.entityId);
}
@@ -1516,6 +1611,9 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
if (struct.isSetOriginalEntityCreationTime()) {
oprot.writeI64(struct.originalEntityCreationTime);
}
+ if (struct.isSetSharedCount()) {
+ oprot.writeI64(struct.sharedCount);
+ }
if (struct.isSetCreatedTime()) {
oprot.writeI64(struct.createdTime);
}
@@ -1527,7 +1625,7 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, Entity struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(12);
+ BitSet incoming = iprot.readBitSet(13);
if (incoming.get(0)) {
struct.entityId = iprot.readString();
struct.setEntityIdIsSet(true);
@@ -1569,10 +1667,14 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
struct.setOriginalEntityCreationTimeIsSet(true);
}
if (incoming.get(10)) {
+ struct.sharedCount = iprot.readI64();
+ struct.setSharedCountIsSet(true);
+ }
+ if (incoming.get(11)) {
struct.createdTime = iprot.readI64();
struct.setCreatedTimeIsSet(true);
}
- if (incoming.get(11)) {
+ if (incoming.get(12)) {
struct.updatedTime = iprot.readI64();
struct.setUpdatedTimeIsSet(true);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/c6608d8f/modules/sharing-registry/sharing-service-docs/api-docs/sharing_models.html
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-service-docs/api-docs/sharing_models.html b/modules/sharing-registry/sharing-service-docs/api-docs/sharing_models.html
index 012356e..a696382 100644
--- a/modules/sharing-registry/sharing-service-docs/api-docs/sharing_models.html
+++ b/modules/sharing-registry/sharing-service-docs/api-docs/sharing_models.html
@@ -242,8 +242,30 @@ regarding the user.</p>
<tr><td>8</td><td>binaryData</td><td><code>binary</code></td><td></td><td>optional</td><td></td></tr>
<tr><td>9</td><td>fullText</td><td><code>string</code></td><td></td><td>optional</td><td></td></tr>
<tr><td>10</td><td>originalEntityCreationTime</td><td><code>i64</code></td><td></td><td>optional</td><td></td></tr>
-<tr><td>11</td><td>createdTime</td><td><code>i64</code></td><td></td><td>optional</td><td></td></tr>
-<tr><td>12</td><td>updatedTime</td><td><code>i64</code></td><td></td><td>optional</td><td></td></tr>
+ <tr>
+ <td>11</td>
+ <td>sharedCount</td>
+ <td><code>i64</code></td>
+ <td></td>
+ <td>optional</td>
+ <td><code>0</code></td>
+ </tr>
+ <tr>
+ <td>12</td>
+ <td>createdTime</td>
+ <td><code>i64</code></td>
+ <td></td>
+ <td>optional</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>13</td>
+ <td>updatedTime</td>
+ <td><code>i64</code></td>
+ <td></td>
+ <td>optional</td>
+ <td></td>
+ </tr>
</table><br/><p>Entity object which is used to register an entity in the system.</p>
<li><b>entityId</b> : Entity id provided by the client</li>
<li><b>domainId</b> : Domain id</li>
http://git-wip-us.apache.org/repos/asf/airavata/blob/c6608d8f/modules/sharing-registry/thrift_models/sharing_models.thrift
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/thrift_models/sharing_models.thrift b/modules/sharing-registry/thrift_models/sharing_models.thrift
index c646c85..2459954 100644
--- a/modules/sharing-registry/thrift_models/sharing_models.thrift
+++ b/modules/sharing-registry/thrift_models/sharing_models.thrift
@@ -223,8 +223,9 @@ struct Entity {
8: optional binary binaryData,
9: optional string fullText,
10: optional i64 originalEntityCreationTime,
- 11: optional i64 createdTime,
- 12: optional i64 updatedTime
+ 11: optional i64 sharedCount = 0,
+ 12: optional i64 createdTime,
+ 13: optional i64 updatedTime
}
/**
[07/50] airavata git commit: AIRAVATA-2335 Tested PGA vhost-based
config on jetstream
Posted by sm...@apache.org.
AIRAVATA-2335 Tested PGA vhost-based config on jetstream
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ebc158dd
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ebc158dd
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ebc158dd
Branch: refs/heads/master
Commit: ebc158ddf56adadae67eec252fe089b0406f109d
Parents: e0110cb
Author: Marcus Christie <ma...@apache.org>
Authored: Tue Mar 14 17:28:33 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue Mar 14 17:29:36 2017 -0400
----------------------------------------------------------------------
.../ansible/inventories/geogateway-dev/group_vars/pga/vars.yml | 2 +-
.../ansible/inventories/testing-0.17/group_vars/pga/vars.yml | 1 +
dev-tools/ansible/inventories/testing-0.17/hosts | 2 +-
dev-tools/ansible/roles/pga/defaults/main.yml | 2 +-
dev-tools/ansible/roles/pga/templates/pga-vhost.conf.j2 | 4 ++--
5 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/ebc158dd/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 3ddc93e..dc0afea 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
@@ -8,7 +8,7 @@ pga_group: "pga"
doc_root_dir: "/var/www/html/geogateway-dev"
user_data_dir: "/var/www/user_data"
-vhost_servername: "gw137.iu.xsede.org"
+#vhost_servername: "gw137.iu.xsede.org"
## WSO2 IS related variables
tenant_domain: "airavata.geog"
http://git-wip-us.apache.org/repos/asf/airavata/blob/ebc158dd/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 dffd691..31683b0 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
@@ -5,6 +5,7 @@ pga_user: "pga"
pga_group: "pga"
doc_root_dir: "/var/www/html/php-gateway"
user_data_dir: "/var/www/user_data"
+#vhost_servername: "{{ groups['pga'][0] }}"
## WSO2 IS related variables
tenant_domain: "prod.seagrid"
http://git-wip-us.apache.org/repos/asf/airavata/blob/ebc158dd/dev-tools/ansible/inventories/testing-0.17/hosts
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17/hosts b/dev-tools/ansible/inventories/testing-0.17/hosts
index 27f378f..ce939fb 100644
--- a/dev-tools/ansible/inventories/testing-0.17/hosts
+++ b/dev-tools/ansible/inventories/testing-0.17/hosts
@@ -20,4 +20,4 @@
149.165.168.5 ansible_user=centos
[pga]
-149.165.156.102 ansible_user=centos
+149.165.156.11 ansible_user=centos
http://git-wip-us.apache.org/repos/asf/airavata/blob/ebc158dd/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 1a541b8..069e9ff 100644
--- a/dev-tools/ansible/roles/pga/defaults/main.yml
+++ b/dev-tools/ansible/roles/pga/defaults/main.yml
@@ -3,7 +3,7 @@ pga_user: "pga"
pga_group: "pga"
doc_root_dir: "/var/www/html/php-gateway"
user_data_dir: "/var/www/user_data"
-vhost_servername: "mygateway.example.com"
+vhost_servername: "{{ groups['pga'][0] }}"
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/ebc158dd/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 82d67fc..59e8406 100644
--- a/dev-tools/ansible/roles/pga/templates/pga-vhost.conf.j2
+++ b/dev-tools/ansible/roles/pga/templates/pga-vhost.conf.j2
@@ -1,8 +1,8 @@
<VirtualHost *:80>
ServerName {{ vhost_servername }}
- DocumentRoot {{ doc_root_dir }}
- <Directory "{{ doc_root_dir }}">
+ DocumentRoot {{ doc_root_dir }}/public
+ <Directory "{{ doc_root_dir }}/public">
AllowOverride All
</Directory>
ErrorLog {{ httpd_log_dir[ansible_os_family] }}/{{ gateway_id }}.error.log
[49/50] airavata git commit: AIRAVATA-2335 Instead of default of 0,
use NOW() for UPDATE_TIME
Posted by sm...@apache.org.
AIRAVATA-2335 Instead of default of 0, use NOW() for UPDATE_TIME
MariaDB/MySQL running in strict mode doesn't allow a 0 date as a default
value for a TIMESTAMP column. Also, there is no longer the restriction
that only one TIMESTAMP column on a table can default to NOW().
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/de5692c5
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/de5692c5
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/de5692c5
Branch: refs/heads/master
Commit: de5692c52901b059cf302a26c14cfc691fcad47c
Parents: 570bc5d
Author: Marcus Christie <ma...@apache.org>
Authored: Fri Mar 31 10:05:06 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Fri Mar 31 10:05:06 2017 -0400
----------------------------------------------------------------------
.../registry-core/src/main/resources/workflowcatalog-mysql.sql | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/de5692c5/modules/registry/registry-core/src/main/resources/workflowcatalog-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/workflowcatalog-mysql.sql b/modules/registry/registry-core/src/main/resources/workflowcatalog-mysql.sql
index 2cc10c6..5a8ef97 100644
--- a/modules/registry/registry-core/src/main/resources/workflowcatalog-mysql.sql
+++ b/modules/registry/registry-core/src/main/resources/workflowcatalog-mysql.sql
@@ -28,8 +28,7 @@ CREATE TABLE WORKFLOW
GRAPH LONGTEXT,
IMAGE BLOB,
CREATION_TIME timestamp DEFAULT NOW(),
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
--- UPDATE_TIME TIMESTAMP DEFAULT NOW() ON UPDATE NOW(),
+ UPDATE_TIME TIMESTAMP DEFAULT NOW() ON UPDATE NOW(),
PRIMARY KEY (TEMPLATE_ID)
);
[16/50] airavata git commit: using BigInt for derby
Posted by sm...@apache.org.
using BigInt for derby
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5d1b3459
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5d1b3459
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5d1b3459
Branch: refs/heads/master
Commit: 5d1b345952ed217732ba271097f850751c333c40
Parents: 866178a
Author: scnakandala <su...@gmail.com>
Authored: Thu Mar 16 15:31:33 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Thu Mar 16 15:31:33 2017 -0400
----------------------------------------------------------------------
.../sharing/registry/db/repositories/EntityRepository.java | 4 ++--
.../src/main/resources/sharing-registry-derby.sql | 2 +-
.../src/main/resources/sharing-registry-mysql.sql | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/5d1b3459/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
index 26c15f0..504a75b 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
@@ -145,8 +145,8 @@ public class EntityRepository extends AbstractRepository<Entity, EntityEntity, E
entity.setDescription((String)(rs[6]));
entity.setBinaryData((byte[]) (rs[7]));
entity.setFullText((String) (rs[8]));
- entity.setOriginalEntityCreationTime((long)(rs[9]));
- entity.setSharedCount((long) rs[10]);
+ entity.setSharedCount((int) rs[9]);
+ entity.setOriginalEntityCreationTime((long) (rs[10]));
entity.setCreatedTime((long) (rs[11]));
entity.setUpdatedTime((long) (rs[12]));
http://git-wip-us.apache.org/repos/asf/airavata/blob/5d1b3459/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql b/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql
index 2a9c82d..4a71a99 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql
+++ b/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql
@@ -101,8 +101,8 @@ CREATE TABLE ENTITY (
DESCRIPTION VARCHAR(255),
BINARY_DATA BLOB,
FULL_TEXT VARCHAR(255),
+ SHARED_COUNT INT DEFAULT 0,
ORIGINAL_ENTITY_CREATION_TIME BIGINT NOT NULL,
- SHARED_COUNT BIGINT DEFAULT 0,
CREATED_TIME BIGINT NOT NULL,
UPDATED_TIME BIGINT NOT NULL,
PRIMARY KEY (ENTITY_ID, DOMAIN_ID),
http://git-wip-us.apache.org/repos/asf/airavata/blob/5d1b3459/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-mysql.sql b/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-mysql.sql
index f3eda86..ad5f435 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-mysql.sql
+++ b/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-mysql.sql
@@ -101,8 +101,8 @@ CREATE TABLE ENTITY (
DESCRIPTION VARCHAR(255),
BINARY_DATA BLOB,
FULL_TEXT TEXT,
+ SHARED_COUNT INT(4) DEFAULT 0,
ORIGINAL_ENTITY_CREATION_TIME BIGINT NOT NULL,
- SHARED_COUNT BIGINT DEFAULT 0,
CREATED_TIME BIGINT NOT NULL,
UPDATED_TIME BIGINT NOT NULL,
PRIMARY KEY (ENTITY_ID, DOMAIN_ID),
[42/50] airavata git commit: AIRAVATA-2347 Getting ExperimentCatalog
inited with project's gateway
Posted by sm...@apache.org.
AIRAVATA-2347 Getting ExperimentCatalog inited with project's gateway
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/8c6f18c5
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/8c6f18c5
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/8c6f18c5
Branch: refs/heads/master
Commit: 8c6f18c59465e8dcde0200c79ac20f6320191814
Parents: 5a92eda
Author: Marcus Christie <ma...@apache.org>
Authored: Mon Mar 27 15:14:58 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Mon Mar 27 15:14:58 2017 -0400
----------------------------------------------------------------------
.../registry/api/service/handler/RegistryServerHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/8c6f18c5/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java b/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java
index 44a71a9..d5d9ec1 100644
--- a/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java
+++ b/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java
@@ -3412,7 +3412,7 @@ public class RegistryServerHandler implements RegistryService.Iface {
throw exception;
}
try {
- experimentCatalog = RegistryFactory.getDefaultExpCatalog();
+ experimentCatalog = RegistryFactory.getExperimentCatalog(updatedProject.getGatewayId());
if (!experimentCatalog.isExist(ExperimentCatalogModelType.PROJECT, projectId)){
logger.error("Project does not exist in the system. Please provide a valid project ID...");
ProjectNotFoundException exception = new ProjectNotFoundException();
[20/50] airavata git commit: adding SQL delta scripts for 0.16-0.17
release migration
Posted by sm...@apache.org.
adding SQL delta scripts for 0.16-0.17 release migration
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/eb7cbc5c
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/eb7cbc5c
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/eb7cbc5c
Branch: refs/heads/master
Commit: eb7cbc5c0786f4bd5a235c6a91d227b2b637ce47
Parents: 58c3d52
Author: Anuj Bhandar <bh...@gmail.com>
Authored: Mon Dec 26 14:22:56 2016 -0500
Committer: Anuj Bhandar <bh...@gmail.com>
Committed: Fri Mar 17 17:48:51 2017 -0400
----------------------------------------------------------------------
.../DeltaScripts/appCatalog_schema_delta.sql | 63 ++++++++++++++++++++
.../credentialStore_schema_delta.sql | 17 ++++++
.../DeltaScripts/expCatalog_schema_delta.sql | 32 ++++++++++
.../replicaCatalog_schema_delta.sql | 12 ++++
.../DeltaScripts/workFlow_schema_delta.sql | 11 ++++
.../0.16-0.17/migration-notes.md | 10 ++++
6 files changed, 145 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/eb7cbc5c/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/appCatalog_schema_delta.sql
----------------------------------------------------------------------
diff --git a/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/appCatalog_schema_delta.sql b/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/appCatalog_schema_delta.sql
new file mode 100644
index 0000000..65f0cdd
--- /dev/null
+++ b/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/appCatalog_schema_delta.sql
@@ -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. */
+
+# Will migrate 0.16 DataBase schema to 0.17 Database Schema
+
+CREATE TABLE `CLOUD_JOB_SUBMISSION` (
+ `JOB_SUBMISSION_INTERFACE_ID` varchar(255) NOT NULL,
+ `EXECUTABLE_TYPE` varchar(255) DEFAULT NULL,
+ `NODE_ID` varchar(255) DEFAULT NULL,
+ `PROVIDER_NAME` varchar(255) DEFAULT NULL,
+ `SECURITY_PROTOCOL` varchar(255) DEFAULT NULL,
+ `USER_ACCOUNT_NAME` varchar(255) DEFAULT NULL,
+ PRIMARY KEY (`JOB_SUBMISSION_INTERFACE_ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+CREATE TABLE `USER_COMPUTE_RESOURCE_PREFERENCE` (
+ `RESOURCE_ID` varchar(255) NOT NULL,
+ `USER_ID` varchar(255) NOT NULL,
+ `PREFERED_BATCH_QUEUE` varchar(255) DEFAULT NULL,
+ `RESOURCE_CS_TOKEN` varchar(255) DEFAULT NULL,
+ `GATEWAY_ID` varchar(255) DEFAULT NULL,
+ `LOGIN_USERNAME` varchar(255) DEFAULT NULL,
+ `ALLOCATION_PROJECT_NUMBER` varchar(255) DEFAULT NULL,
+ `QUALITY_OF_SERVICE` varchar(255) DEFAULT NULL,
+ `RESERVATION` varchar(255) DEFAULT NULL,
+ `RESERVATION_END_TIME` datetime DEFAULT NULL,
+ `RESERVATION_START_TIME` datetime DEFAULT NULL,
+ `SCRATCH_LOCATION` varchar(255) DEFAULT NULL,
+ PRIMARY KEY (`RESOURCE_ID`,`USER_ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+CREATE TABLE `USER_RESOURCE_PROFILE` (
+ `USER_ID` varchar(255) NOT NULL,
+ `CREATION_TIME` datetime DEFAULT NULL,
+ `CS_TOKEN` varchar(255) DEFAULT NULL,
+ `GATEWAY_ID` varchar(255) DEFAULT NULL,
+ `IDENTITY_SERVER_PWD_CRED_TOKEN` varchar(255) DEFAULT NULL,
+ `IDENTITY_SERVER_TENANT` varchar(255) DEFAULT NULL,
+ `UPDATE_TIME` datetime DEFAULT NULL,
+ PRIMARY KEY (`USER_ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+CREATE TABLE `USER_STORAGE_PREFERENCE` (
+ `STORAGE_RESOURCE_ID` varchar(255) NOT NULL,
+ `USER_ID` varchar(255) NOT NULL,
+ `RESOURCE_CS_TOKEN` varchar(255) DEFAULT NULL,
+ `FS_ROOT_LOCATION` varchar(255) DEFAULT NULL,
+ `GATEWAY_ID` varchar(255) DEFAULT NULL,
+ `LOGIN_USERNAME` varchar(255) DEFAULT NULL,
+ PRIMARY KEY (`STORAGE_RESOURCE_ID`,`USER_ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+ALTER TABLE `APPLICATION_DEPLOYMENT` ADD `DEFAULT_CPU_COUNT` int(11) DEFAULT NULL;
+ALTER TABLE `APPLICATION_DEPLOYMENT` ADD `DEFAULT_NODE_COUNT` int(11) DEFAULT NULL;
+ALTER TABLE `APPLICATION_DEPLOYMENT` ADD `DEFAULT_QUEUE_NAME` varchar(255) DEFAULT NULL;
+ALTER TABLE `APPLICATION_DEPLOYMENT` ADD `EDITABLE_BY_USER` bit(1) DEFAULT NULL;
+ALTER TABLE `BATCH_QUEUE` ADD `CPU_PER_NODE` int(11) DEFAULT NULL;
+ALTER TABLE `BATCH_QUEUE` ADD `DEFAULT_CPU_COUNT` int(11) DEFAULT NULL;
+ALTER TABLE `BATCH_QUEUE` ADD `DEFAULT_NODE_COUNT` int(11) DEFAULT NULL;
+ALTER TABLE `BATCH_QUEUE` ADD `IS_DEFAULT_QUEUE` bit(1) DEFAULT NULL;
+ALTER TABLE `LOCAL_SUBMISSION` ADD `SECURITY_PROTOCOL` varchar(255) DEFAULT NULL;
+ALTER TABLE `GATEWAY_CLIENT_CREDENTIAL` CHANGE `CLIENT_KEY` `CLIENT_KEY` varchar(255) NOT NULL;
http://git-wip-us.apache.org/repos/asf/airavata/blob/eb7cbc5c/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/credentialStore_schema_delta.sql
----------------------------------------------------------------------
diff --git a/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/credentialStore_schema_delta.sql b/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/credentialStore_schema_delta.sql
new file mode 100644
index 0000000..3a2c1b1
--- /dev/null
+++ b/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/credentialStore_schema_delta.sql
@@ -0,0 +1,17 @@
+/* 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. */
+
+# Will migrate 0.16 DataBase schema to 0.17 Database Schema
+
+CREATE TABLE `CONFIGURATION` (
+ `CONFIG_KEY` varchar(255) NOT NULL DEFAULT '',
+ `CONFIG_VAL` varchar(255) NOT NULL DEFAULT '',
+ PRIMARY KEY (`CONFIG_KEY`,`CONFIG_VAL`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+ALTER TABLE `CREDENTIALS` ADD `DESCRIPTION` varchar(512) DEFAULT NULL;
+ALTER TABLE `CREDENTIALS` ADD `CREDENTIAL_OWNER_TYPE` varchar(10) NOT NULL DEFAULT 'GATEWAY';
http://git-wip-us.apache.org/repos/asf/airavata/blob/eb7cbc5c/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/expCatalog_schema_delta.sql
----------------------------------------------------------------------
diff --git a/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/expCatalog_schema_delta.sql b/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/expCatalog_schema_delta.sql
new file mode 100644
index 0000000..38bf61c
--- /dev/null
+++ b/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/expCatalog_schema_delta.sql
@@ -0,0 +1,32 @@
+/* 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. */
+
+# Will migrate 0.16 DataBase schema to 0.17 Database Schema
+
+CREATE TABLE `QUEUE_STATUS` (
+ `HOST_NAME` varchar(255) NOT NULL,
+ `QUEUE_NAME` varchar(255) NOT NULL,
+ `CREATED_TIME` bigint(20) NOT NULL,
+ `QUEUE_UP` bit(1) DEFAULT NULL,
+ `QUEUED_JOBS` int(11) DEFAULT NULL,
+ `RUNNING_JOBS` int(11) DEFAULT NULL,
+ PRIMARY KEY (`HOST_NAME`,`QUEUE_NAME`,`CREATED_TIME`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+ALTER TABLE `GATEWAY` ADD `DECLINED_REASON` varchar(255) DEFAULT NULL;
+ALTER TABLE `GATEWAY` ADD `OAUTH_CLIENT_SECRET` varchar(255) DEFAULT NULL;
+ALTER TABLE `GATEWAY` ADD `OAUTH_CLIENT_ID` varchar(255) DEFAULT NULL;
+ALTER TABLE `GATEWAY` ADD `REQUEST_CREATION_TIME` datetime DEFAULT CURRENT_TIMESTAMP;
+ALTER TABLE `GATEWAY` ADD `REQUESTER_USERNAME` varchar(255) DEFAULT NULL;
+ALTER TABLE `GATEWAY` ADD `GATEWAY_DOMAIN` varchar(255) DEFAULT NULL;
+ALTER TABLE `PROCESS` ADD `USE_USER_CR_PREF` bit(1) DEFAULT NULL;
+ALTER TABLE `USER_CONFIGURATION_DATA` ADD `IS_USE_USER_CR_PREF` bit(1) DEFAULT NULL;
+ALTER TABLE `EXPERIMENT_STATUS` CHANGE `TIME_OF_STATE_CHANGE` `TIME_OF_STATE_CHANGE` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
+ALTER TABLE `JOB_STATUS` CHANGE `TIME_OF_STATE_CHANGE` `TIME_OF_STATE_CHANGE` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
+ALTER TABLE `NOTIFICATION` CHANGE `NOTIFICATION_MESSAGE` `NOTIFICATION_MESSAGE` varchar(4096) NOT NULL;
+ALTER TABLE `USERS` CHANGE `AIRAVATA_INTERNAL_USER_ID` `AIRAVATA_INTERNAL_USER_ID` varchar(255) NOT NULL;
+ALTER TABLE `USERS` ADD UNIQUE KEY `AIRAVATA_INTERNAL_USER_ID` (`AIRAVATA_INTERNAL_USER_ID`);
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/eb7cbc5c/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/replicaCatalog_schema_delta.sql
----------------------------------------------------------------------
diff --git a/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/replicaCatalog_schema_delta.sql b/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/replicaCatalog_schema_delta.sql
new file mode 100644
index 0000000..c00e653
--- /dev/null
+++ b/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/replicaCatalog_schema_delta.sql
@@ -0,0 +1,12 @@
+/* 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. */
+
+# Will migrate 0.16 DataBase schema to 0.17 Database Schema
+
+ALTER TABLE `DATA_PRODUCT` ADD KEY `PARENT_PRODUCT_URI` (`PARENT_PRODUCT_URI`);
+ALTER TABLE `DATA_PRODUCT` ADD CONSTRAINT `DATA_PRODUCT_ibfk_1` FOREIGN KEY (`PARENT_PRODUCT_URI`) REFERENCES `DATA_PRODUCT` (`PRODUCT_URI`) ON DELETE CASCADE;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/eb7cbc5c/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/workFlow_schema_delta.sql
----------------------------------------------------------------------
diff --git a/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/workFlow_schema_delta.sql b/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/workFlow_schema_delta.sql
new file mode 100644
index 0000000..9b30353
--- /dev/null
+++ b/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/workFlow_schema_delta.sql
@@ -0,0 +1,11 @@
+/* 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. */
+
+# Will migrate 0.16 DataBase schema to 0.17 Database Schema
+
+# No Migration needed, schema's are identical
http://git-wip-us.apache.org/repos/asf/airavata/blob/eb7cbc5c/modules/registry/release-migration-scripts/0.16-0.17/migration-notes.md
----------------------------------------------------------------------
diff --git a/modules/registry/release-migration-scripts/0.16-0.17/migration-notes.md b/modules/registry/release-migration-scripts/0.16-0.17/migration-notes.md
new file mode 100644
index 0000000..13d624b
--- /dev/null
+++ b/modules/registry/release-migration-scripts/0.16-0.17/migration-notes.md
@@ -0,0 +1,10 @@
+## 0.16 - 0.17 Migration Notes
+
+ ### Known Issues:
+
+ * Experiment catalog - _NOTIFICATION_ and _USER_ table's column ordering differs, apart from this difference all other constraints are met
+
+ ### Migration Steps:
+
+ * Execute the SQL scripts present in DeltaScripts folder on top of Airavata 0.16 Release Database
+ * dev_sharingcatalog and dev_grouper database schema's are not present in Airavata 0.16 Release, hence whole database has to be migrated, therefore not delta scripts are generated.
\ No newline at end of file
[10/50] airavata git commit: adding shared count name
Posted by sm...@apache.org.
adding shared count name
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/505e30ca
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/505e30ca
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/505e30ca
Branch: refs/heads/master
Commit: 505e30cad2525584646bf8e00654f122e60673fa
Parents: c6608d8
Author: scnakandala <su...@gmail.com>
Authored: Thu Mar 16 14:37:46 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Thu Mar 16 14:37:46 2017 -0400
----------------------------------------------------------------------
.../apache/airavata/sharing/registry/db/entities/EntityEntity.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/505e30ca/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java
index dba36f2..199870c 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java
@@ -146,7 +146,7 @@ public class EntityEntity {
}
@Basic
- @Column(name = "SHARED")
+ @Column(name = "SHARED_COUNT")
public int getSharedCount() {
return sharedCount;
}
[47/50] airavata git commit: AIRAVATA-2350 Join to
USER_RESOURCE_PROFILE on USER_ID/GATEWAY_ID
Posted by sm...@apache.org.
AIRAVATA-2350 Join to USER_RESOURCE_PROFILE on USER_ID/GATEWAY_ID
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b45bac66
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b45bac66
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b45bac66
Branch: refs/heads/master
Commit: b45bac667e89f246d85a0b1b76ce00e8d327ea55
Parents: 98ebc2c
Author: Marcus Christie <ma...@apache.org>
Authored: Wed Mar 29 13:00:57 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Wed Mar 29 13:00:57 2017 -0400
----------------------------------------------------------------------
.../core/app/catalog/model/UserComputeResourcePreference.java | 5 ++++-
.../registry/core/app/catalog/model/UserStoragePreference.java | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/b45bac66/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/UserComputeResourcePreference.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/UserComputeResourcePreference.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/UserComputeResourcePreference.java
index 599793a..bed8860 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/UserComputeResourcePreference.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/UserComputeResourcePreference.java
@@ -64,7 +64,10 @@ public class UserComputeResourcePreference {
@ManyToOne(cascade= CascadeType.MERGE)
- @JoinColumn(name = "USER_ID")
+ @JoinColumns({
+ @JoinColumn(name = "USER_ID"),
+ @JoinColumn(name = "GATEWAY_ID")
+ })
private UserResourceProfile userResouceProfile;
/*User Id should be linked to user profile table once it is finalized and created*/
http://git-wip-us.apache.org/repos/asf/airavata/blob/b45bac66/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/UserStoragePreference.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/UserStoragePreference.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/UserStoragePreference.java
index 9b96d9f..01811c4 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/UserStoragePreference.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/UserStoragePreference.java
@@ -45,7 +45,10 @@ public class UserStoragePreference {
private String computeResourceCSToken;
@ManyToOne(cascade= CascadeType.MERGE)
- @JoinColumn(name = "USER_ID")
+ @JoinColumns({
+ @JoinColumn(name = "USER_ID"),
+ @JoinColumn(name = "GATEWAY_ID")
+ })
private UserResourceProfile userResourceProfile;
public String getUserId() {
[08/50] airavata git commit: GeoGateway PGA deploy;
PGA virtual host based conf
Posted by sm...@apache.org.
GeoGateway PGA deploy; PGA virtual host based conf
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e0110cbb
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e0110cbb
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e0110cbb
Branch: refs/heads/master
Commit: e0110cbb5a52ceb0a9b9b1a3452d91052840d577
Parents: f9eb7bc
Author: Marcus Christie <ma...@apache.org>
Authored: Wed Mar 8 16:58:29 2017 -0500
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue Mar 14 17:29:36 2017 -0400
----------------------------------------------------------------------
.../geogateway-dev/group_vars/pga/vars.yml | 34 ++
.../geogateway-dev/group_vars/pga/vault.yml | 18 +
.../ansible/inventories/geogateway-dev/hosts | 2 +
dev-tools/ansible/roles/pga/defaults/main.yml | 11 +-
.../roles/pga/tasks/install_deps_CentOS_6.yml | 33 ++
dev-tools/ansible/roles/pga/tasks/main.yml | 3 +-
.../ansible/roles/pga/templates/apache2.conf.j2 | 222 ------------
.../ansible/roles/pga/templates/httpd.conf.j2 | 353 -------------------
.../roles/pga/templates/pga-vhost.conf.j2 | 11 +
9 files changed, 106 insertions(+), 581 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/e0110cbb/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
new file mode 100644
index 0000000..3ddc93e
--- /dev/null
+++ b/dev-tools/ansible/inventories/geogateway-dev/group_vars/pga/vars.yml
@@ -0,0 +1,34 @@
+---
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+pga_git_branch: "develop"
+user: "pga"
+group: "pga"
+pga_user: "pga"
+pga_group: "pga"
+doc_root_dir: "/var/www/html/geogateway-dev"
+user_data_dir: "/var/www/user_data"
+
+vhost_servername: "gw137.iu.xsede.org"
+
+## WSO2 IS related variables
+tenant_domain: "airavata.geog"
+admin_username: "adminuser"
+admin_password: "{{ vault_admin_password }}"
+oauth_client_key: "{{ vault_oauth_client_key }}"
+oauth_client_secret: "{{ vault_oauth_client_secret }}"
+
+## Airavata Client related variables
+airavata_server: "tls://gw56.iu.xsede.org"
+airavata_port: "9930"
+gateway_id: "GeoGateway"
+# 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"
+
+## 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 }}"
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/e0110cbb/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
new file mode 100644
index 0000000..7a518f2
--- /dev/null
+++ b/dev-tools/ansible/inventories/geogateway-dev/group_vars/pga/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+32366561643361633736313164303438383164373234613062303662333832373338373432356562
+3966646664353835343865636333636432313733373830630a643539663361316165636661613232
+65323238316663613136326263643732333537626463636235356465623561663265396361313764
+3562653238623365320a643739376532396137613630383264333162393162646465626565393061
+30373364353766303965653731393735643931343035616666663430323939363232646661366261
+63306363373462666263613430383866373561623163656461396663343031346238666430653865
+61333631616362333430333739316563303866623563333564333061623563643231383963623139
+31396364393239303037636661303631336434343638393232366635323231386432613437353239
+30313834356639306265326364623538663137616339303363333536346365633562663164386438
+31643363666130373633383132346563643334313066386230333330356233663066656462393734
+65666434383533613939386630376165666666303465356434346461343763303139623762623536
+33336532656237363730366432363138373337303633646630343861383836646563623535303833
+35306634383332643630363363323635363331643535653932353131616565666461303538396638
+35306665363530326634313764353262303635663362373432663038313634656663636431356266
+65313837613161353936653163316538646533656530633134656336666266353462613333343634
+35343365653934613230396537663933663731373538316236386531376337313033363735623233
+61316565666337373834396235363634616331666463356131326130663835303137
http://git-wip-us.apache.org/repos/asf/airavata/blob/e0110cbb/dev-tools/ansible/inventories/geogateway-dev/hosts
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/geogateway-dev/hosts b/dev-tools/ansible/inventories/geogateway-dev/hosts
new file mode 100644
index 0000000..197b94a
--- /dev/null
+++ b/dev-tools/ansible/inventories/geogateway-dev/hosts
@@ -0,0 +1,2 @@
+[pga]
+gw137.iu.xsede.org ansible_user=root
http://git-wip-us.apache.org/repos/asf/airavata/blob/e0110cbb/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 0ea3ce1..1a541b8 100644
--- a/dev-tools/ansible/roles/pga/defaults/main.yml
+++ b/dev-tools/ansible/roles/pga/defaults/main.yml
@@ -3,13 +3,16 @@ pga_user: "pga"
pga_group: "pga"
doc_root_dir: "/var/www/html/php-gateway"
user_data_dir: "/var/www/user_data"
-#httpd_conf_file: "/etc/httpd/conf/httpd.conf"
-httpd_conf_file_location:
- RedHat: "/etc/httpd/conf/httpd.conf"
- Debian: "/etc/apache2/apache2.conf"
+vhost_servername: "mygateway.example.com"
+httpd_confd_file_location:
+ RedHat: "/etc/httpd/conf.d/pga-{{ gateway_id }}.conf"
+ Debian: "/etc/apache2/sites-available/pga-{{ gateway_id }}.conf"
httpd_name:
Debian: apache2
RedHat: httpd
+httpd_log_dir:
+ Debian: /var/log/apache2
+ RedHat: /var/log/httpd
## WSO2 IS related variables
tenant_domain: "prod.testdrive"
http://git-wip-us.apache.org/repos/asf/airavata/blob/e0110cbb/dev-tools/ansible/roles/pga/tasks/install_deps_CentOS_6.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/tasks/install_deps_CentOS_6.yml b/dev-tools/ansible/roles/pga/tasks/install_deps_CentOS_6.yml
new file mode 100644
index 0000000..8da9aa3
--- /dev/null
+++ b/dev-tools/ansible/roles/pga/tasks/install_deps_CentOS_6.yml
@@ -0,0 +1,33 @@
+---
+
+- name: Install pre-requisites
+ yum: name="{{ item }}" state=latest update_cache=yes
+ with_items:
+ - git
+ - httpd
+ - php
+ - php-soap
+ - libselinux-python
+ - php-pdo
+ become: yes
+#"
+
+# - name: Allow selinux outbound connection from web server
+ # command: setsebool -P httpd_can_network_connect 1
+
+- name: install composer
+ shell: curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+ args:
+ creates: /usr/local/bin/composer
+ become: yes
+
+- name: install epel release
+ yum: name=epel-release state=present
+ become: yes
+
+#OS_dep
+# depend on epel release
+- name: install mcrypt
+ yum: name=php-mcrypt state=latest update_cache=yes
+ become: yes
+
http://git-wip-us.apache.org/repos/asf/airavata/blob/e0110cbb/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 e02c517..4662a17 100644
--- a/dev-tools/ansible/roles/pga/tasks/main.yml
+++ b/dev-tools/ansible/roles/pga/tasks/main.yml
@@ -49,7 +49,6 @@
template: src=pga_config.php.j2 dest="{{ doc_root_dir }}/app/config/pga_config.php"
become: yes
-# give write permission to storage directory
- name: give read permissions to doc root
file: path="{{ doc_root_dir }}" state=directory mode=0755 recurse=yes
become: yes
@@ -66,7 +65,7 @@
become: yes
- name: copy httpd.conf file
- template: src={{ httpd_name[ansible_os_family] }}.conf.j2 dest={{ httpd_conf_file_location[ansible_os_family] }}
+ template: src=pga-vhost.conf.j2 dest={{ httpd_confd_file_location[ansible_os_family] }} backup=yes
become: yes
notify:
- restart httpd
http://git-wip-us.apache.org/repos/asf/airavata/blob/e0110cbb/dev-tools/ansible/roles/pga/templates/apache2.conf.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/templates/apache2.conf.j2 b/dev-tools/ansible/roles/pga/templates/apache2.conf.j2
deleted file mode 100644
index e547f78..0000000
--- a/dev-tools/ansible/roles/pga/templates/apache2.conf.j2
+++ /dev/null
@@ -1,222 +0,0 @@
-# This is the main Apache server configuration file. It contains the
-# configuration directives that give the server its instructions.
-# See http://httpd.apache.org/docs/2.4/ for detailed information about
-# the directives and /usr/share/doc/apache2/README.Debian about Debian specific
-# hints.
-#
-#
-# Summary of how the Apache 2 configuration works in Debian:
-# The Apache 2 web server configuration in Debian is quite different to
-# upstream's suggested way to configure the web server. This is because Debian's
-# default Apache2 installation attempts to make adding and removing modules,
-# virtual hosts, and extra configuration directives as flexible as possible, in
-# order to make automating the changes and administering the server as easy as
-# possible.
-
-# It is split into several files forming the configuration hierarchy outlined
-# below, all located in the /etc/apache2/ directory:
-#
-# /etc/apache2/
-# |-- apache2.conf
-# | `-- ports.conf
-# |-- mods-enabled
-# | |-- *.load
-# | `-- *.conf
-# |-- conf-enabled
-# | `-- *.conf
-# `-- sites-enabled
-# `-- *.conf
-#
-#
-# * apache2.conf is the main configuration file (this file). It puts the pieces
-# together by including all remaining configuration files when starting up the
-# web server.
-#
-# * ports.conf is always included from the main configuration file. It is
-# supposed to determine listening ports for incoming connections which can be
-# customized anytime.
-#
-# * Configuration files in the mods-enabled/, conf-enabled/ and sites-enabled/
-# directories contain particular configuration snippets which manage modules,
-# global configuration fragments, or virtual host configurations,
-# respectively.
-#
-# They are activated by symlinking available configuration files from their
-# respective *-available/ counterparts. These should be managed by using our
-# helpers a2enmod/a2dismod, a2ensite/a2dissite and a2enconf/a2disconf. See
-# their respective man pages for detailed information.
-#
-# * The binary is called apache2. Due to the use of environment variables, in
-# the default configuration, apache2 needs to be started/stopped with
-# /etc/init.d/apache2 or apache2ctl. Calling /usr/bin/apache2 directly will not
-# work with the default configuration.
-
-
-# Global configuration
-#
-
-#
-# ServerRoot: The top of the directory tree under which the server's
-# configuration, error, and log files are kept.
-#
-# NOTE! If you intend to place this on an NFS (or otherwise network)
-# mounted filesystem then please read the Mutex documentation (available
-# at <URL:http://httpd.apache.org/docs/2.4/mod/core.html#mutex>);
-# you will save yourself a lot of trouble.
-#
-# Do NOT add a slash at the end of the directory path.
-#
-#ServerRoot "/etc/apache2"
-DocumentRoot "/var/www/html/php-gateway/public"
-
-#
-# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
-#
-Mutex file:${APACHE_LOCK_DIR} default
-
-#
-# PidFile: The file in which the server should record its process
-# identification number when it starts.
-# This needs to be set in /etc/apache2/envvars
-#
-PidFile ${APACHE_PID_FILE}
-
-#
-# Timeout: The number of seconds before receives and sends time out.
-#
-Timeout 300
-
-#
-# KeepAlive: Whether or not to allow persistent connections (more than
-# one request per connection). Set to "Off" to deactivate.
-#
-KeepAlive On
-
-#
-# MaxKeepAliveRequests: The maximum number of requests to allow
-# during a persistent connection. Set to 0 to allow an unlimited amount.
-# We recommend you leave this number high, for maximum performance.
-#
-MaxKeepAliveRequests 100
-
-#
-# KeepAliveTimeout: Number of seconds to wait for the next request from the
-# same client on the same connection.
-#
-KeepAliveTimeout 5
-
-
-# These need to be set in /etc/apache2/envvars
-User ${APACHE_RUN_USER}
-Group ${APACHE_RUN_GROUP}
-
-#
-# HostnameLookups: Log the names of clients or just their IP addresses
-# e.g., www.apache.org (on) or 204.62.129.132 (off).
-# The default is off because it'd be overall better for the net if people
-# had to knowingly turn this feature on, since enabling it means that
-# each client request will result in AT LEAST one lookup request to the
-# nameserver.
-#
-HostnameLookups Off
-
-# ErrorLog: The location of the error log file.
-# If you do not specify an ErrorLog directive within a <VirtualHost>
-# container, error messages relating to that virtual host will be
-# logged here. If you *do* define an error logfile for a <VirtualHost>
-# container, that host's errors will be logged there and not here.
-#
-ErrorLog ${APACHE_LOG_DIR}/error.log
-
-#
-# LogLevel: Control the severity of messages logged to the error_log.
-# Available values: trace8, ..., trace1, debug, info, notice, warn,
-# error, crit, alert, emerg.
-# It is also possible to configure the log level for particular modules, e.g.
-# "LogLevel info ssl:warn"
-#
-LogLevel warn
-
-# Include module configuration:
-IncludeOptional mods-enabled/*.load
-IncludeOptional mods-enabled/*.conf
-
-# Include list of ports to listen on
-Include ports.conf
-
-
-# Sets the default security model of the Apache2 HTTPD server. It does
-# not allow access to the root filesystem outside of /usr/share and /var/www.
-# The former is used by web applications packaged in Debian,
-# the latter may be used for local directories served by the web server. If
-# your system is serving content from a sub-directory in /srv you must allow
-# access here, or in any related virtual host.
-<Directory />
- Options FollowSymLinks
- AllowOverride None
- Require all denied
-</Directory>
-
-<Directory /usr/share>
- AllowOverride None
- Require all granted
-</Directory>
-
-<Directory /var/www/>
- Options Indexes FollowSymLinks
- AllowOverride All
- Require all granted
-</Directory>
-
-#<Directory /srv/>
-# Options Indexes FollowSymLinks
-# AllowOverride None
-# Require all granted
-#</Directory>
-
-
-
-
-# AccessFileName: The name of the file to look for in each directory
-# for additional configuration directives. See also the AllowOverride
-# directive.
-#
-AccessFileName .htaccess
-
-#
-# The following lines prevent .htaccess and .htpasswd files from being
-# viewed by Web clients.
-#
-<FilesMatch "^\.ht">
- Require all denied
-</FilesMatch>
-
-
-#
-# The following directives define some format nicknames for use with
-# a CustomLog directive.
-#
-# These deviate from the Common Log Format definitions in that they use %O
-# (the actual bytes sent including headers) instead of %b (the size of the
-# requested file), because the latter makes it impossible to detect partial
-# requests.
-#
-# Note that the use of %{X-Forwarded-For}i instead of %h is not recommended.
-# Use mod_remoteip instead.
-#
-LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
-LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
-LogFormat "%h %l %u %t \"%r\" %>s %O" common
-LogFormat "%{Referer}i -> %U" referer
-LogFormat "%{User-agent}i" agent
-
-# Include of directories ignores editors' and dpkg's backup files,
-# see README.Debian for details.
-
-# Include generic snippets of statements
-IncludeOptional conf-enabled/*.conf
-
-# Include the virtual host configurations:
-IncludeOptional sites-enabled/*.conf
-
-# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
http://git-wip-us.apache.org/repos/asf/airavata/blob/e0110cbb/dev-tools/ansible/roles/pga/templates/httpd.conf.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/templates/httpd.conf.j2 b/dev-tools/ansible/roles/pga/templates/httpd.conf.j2
deleted file mode 100644
index febb204..0000000
--- a/dev-tools/ansible/roles/pga/templates/httpd.conf.j2
+++ /dev/null
@@ -1,353 +0,0 @@
-#
-# This is the main Apache HTTP server configuration file. It contains the
-# configuration directives that give the server its instructions.
-# See <URL:http://httpd.apache.org/docs/2.4/> for detailed information.
-# In particular, see
-# <URL:http://httpd.apache.org/docs/2.4/mod/directives.html>
-# for a discussion of each configuration directive.
-#
-# Do NOT simply read the instructions in here without understanding
-# what they do. They're here only as hints or reminders. If you are unsure
-# consult the online docs. You have been warned.
-#
-# Configuration and logfile names: If the filenames you specify for many
-# of the server's control files begin with "/" (or "drive:/" for Win32), the
-# server will use that explicit path. If the filenames do *not* begin
-# with "/", the value of ServerRoot is prepended -- so 'log/access_log'
-# with ServerRoot set to '/www' will be interpreted by the
-# server as '/www/log/access_log', where as '/log/access_log' will be
-# interpreted as '/log/access_log'.
-
-#
-# ServerRoot: The top of the directory tree under which the server's
-# configuration, error, and log files are kept.
-#
-# Do not add a slash at the end of the directory path. If you point
-# ServerRoot at a non-local disk, be sure to specify a local disk on the
-# Mutex directive, if file-based mutexes are used. If you wish to share the
-# same ServerRoot for multiple httpd daemons, you will need to change at
-# least PidFile.
-#
-ServerRoot "/etc/httpd"
-
-#
-# Listen: Allows you to bind Apache to specific IP addresses and/or
-# ports, instead of the default. See also the <VirtualHost>
-# directive.
-#
-# Change this to Listen on specific IP addresses as shown below to
-# prevent Apache from glomming onto all bound IP addresses.
-#
-#Listen 12.34.56.78:80
-Listen 80
-
-#
-# Dynamic Shared Object (DSO) Support
-#
-# To be able to use the functionality of a module which was built as a DSO you
-# have to place corresponding `LoadModule' lines at this location so the
-# directives contained in it are actually available _before_ they are used.
-# Statically compiled modules (those listed by `httpd -l') do not need
-# to be loaded here.
-#
-# Example:
-# LoadModule foo_module modules/mod_foo.so
-#
-Include conf.modules.d/*.conf
-
-#
-# If you wish httpd to run as a different user or group, you must run
-# httpd as root initially and it will switch.
-#
-# User/Group: The name (or #number) of the user/group to run httpd as.
-# It is usually good practice to create a dedicated user and group for
-# running httpd, as with most system services.
-#
-User apache
-Group apache
-
-# 'Main' server configuration
-#
-# The directives in this section set up the values used by the 'main'
-# server, which responds to any requests that aren't handled by a
-# <VirtualHost> definition. These values also provide defaults for
-# any <VirtualHost> containers you may define later in the file.
-#
-# All of these directives may appear inside <VirtualHost> containers,
-# in which case these default settings will be overridden for the
-# virtual host being defined.
-#
-
-#
-# ServerAdmin: Your address, where problems with the server should be
-# e-mailed. This address appears on some server-generated pages, such
-# as error documents. e.g. admin@your-domain.com
-#
-ServerAdmin root@localhost
-
-#
-# ServerName gives the name and port that the server uses to identify itself.
-# This can often be determined automatically, but we recommend you specify
-# it explicitly to prevent problems during startup.
-#
-# If your host doesn't have a registered DNS name, enter its IP address here.
-#
-#ServerName www.example.com:80
-
-#
-# Deny access to the entirety of your server's filesystem. You must
-# explicitly permit access to web content directories in other
-# <Directory> blocks below.
-#
-<Directory />
- AllowOverride none
- Require all denied
-</Directory>
-
-#
-# Note that from this point forward you must specifically allow
-# particular features to be enabled - so if something's not working as
-# you might expect, make sure that you have specifically enabled it
-# below.
-#
-
-#
-# DocumentRoot: The directory out of which you will serve your
-# documents. By default, all requests are taken from this directory, but
-# symbolic links and aliases may be used to point to other locations.
-#
-DocumentRoot "/var/www/html/php-gateway/public"
-
-#
-# Relax access to content within /var/www.
-#
-<Directory "/var/www">
- AllowOverride None
- # Allow open access:
- Require all granted
-</Directory>
-
-# Further relax access to the default document root:
-<Directory "/var/www/html">
- #
- # Possible values for the Options directive are "None", "All",
- # or any combination of:
- # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
- #
- # Note that "MultiViews" must be named *explicitly* --- "Options All"
- # doesn't give it to you.
- #
- # The Options directive is both complicated and important. Please see
- # http://httpd.apache.org/docs/2.4/mod/core.html#options
- # for more information.
- #
- Options Indexes FollowSymLinks
-
- #
- # AllowOverride controls what directives may be placed in .htaccess files.
- # It can be "All", "None", or any combination of the keywords:
- # Options FileInfo AuthConfig Limit
- #
- AllowOverride All
-
- #
- # Controls who can get stuff from this server.
- #
- Require all granted
-</Directory>
-
-#
-# DirectoryIndex: sets the file that Apache will serve if a directory
-# is requested.
-#
-<IfModule dir_module>
- DirectoryIndex index.html
-</IfModule>
-
-#
-# The following lines prevent .htaccess and .htpasswd files from being
-# viewed by Web clients.
-#
-<Files ".ht*">
- Require all denied
-</Files>
-
-#
-# ErrorLog: The location of the error log file.
-# If you do not specify an ErrorLog directive within a <VirtualHost>
-# container, error messages relating to that virtual host will be
-# logged here. If you *do* define an error logfile for a <VirtualHost>
-# container, that host's errors will be logged there and not here.
-#
-ErrorLog "logs/error_log"
-
-#
-# LogLevel: Control the number of messages logged to the error_log.
-# Possible values include: debug, info, notice, warn, error, crit,
-# alert, emerg.
-#
-LogLevel warn
-
-<IfModule log_config_module>
- #
- # The following directives define some format nicknames for use with
- # a CustomLog directive (see below).
- #
- LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
- LogFormat "%h %l %u %t \"%r\" %>s %b" common
-
- <IfModule logio_module>
- # You need to enable mod_logio.c to use %I and %O
- LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
- </IfModule>
-
- #
- # The location and format of the access logfile (Common Logfile Format).
- # If you do not define any access logfiles within a <VirtualHost>
- # container, they will be logged here. Contrariwise, if you *do*
- # define per-<VirtualHost> access logfiles, transactions will be
- # logged therein and *not* in this file.
- #
- #CustomLog "logs/access_log" common
-
- #
- # If you prefer a logfile with access, agent, and referer information
- # (Combined Logfile Format) you can use the following directive.
- #
- CustomLog "logs/access_log" combined
-</IfModule>
-
-<IfModule alias_module>
- #
- # Redirect: Allows you to tell clients about documents that used to
- # exist in your server's namespace, but do not anymore. The client
- # will make a new request for the document at its new location.
- # Example:
- # Redirect permanent /foo http://www.example.com/bar
-
- #
- # Alias: Maps web paths into filesystem paths and is used to
- # access content that does not live under the DocumentRoot.
- # Example:
- # Alias /webpath /full/filesystem/path
- #
- # If you include a trailing / on /webpath then the server will
- # require it to be present in the URL. You will also likely
- # need to provide a <Directory> section to allow access to
- # the filesystem path.
-
- #
- # ScriptAlias: This controls which directories contain server scripts.
- # ScriptAliases are essentially the same as Aliases, except that
- # documents in the target directory are treated as applications and
- # run by the server when requested rather than as documents sent to the
- # client. The same rules about trailing "/" apply to ScriptAlias
- # directives as to Alias.
- #
- ScriptAlias /cgi-bin/ "/var/www/cgi-bin/"
-
-</IfModule>
-
-#
-# "/var/www/cgi-bin" should be changed to whatever your ScriptAliased
-# CGI directory exists, if you have that configured.
-#
-<Directory "/var/www/cgi-bin">
- AllowOverride None
- Options None
- Require all granted
-</Directory>
-
-<IfModule mime_module>
- #
- # TypesConfig points to the file containing the list of mappings from
- # filename extension to MIME-type.
- #
- TypesConfig /etc/mime.types
-
- #
- # AddType allows you to add to or override the MIME configuration
- # file specified in TypesConfig for specific file types.
- #
- #AddType application/x-gzip .tgz
- #
- # AddEncoding allows you to have certain browsers uncompress
- # information on the fly. Note: Not all browsers support this.
- #
- #AddEncoding x-compress .Z
- #AddEncoding x-gzip .gz .tgz
- #
- # If the AddEncoding directives above are commented-out, then you
- # probably should define those extensions to indicate media types:
- #
- AddType application/x-compress .Z
- AddType application/x-gzip .gz .tgz
-
- #
- # AddHandler allows you to map certain file extensions to "handlers":
- # actions unrelated to filetype. These can be either built into the server
- # or added with the Action directive (see below)
- #
- # To use CGI scripts outside of ScriptAliased directories:
- # (You will also need to add "ExecCGI" to the "Options" directive.)
- #
- #AddHandler cgi-script .cgi
-
- # For type maps (negotiated resources):
- #AddHandler type-map var
-
- #
- # Filters allow you to process content before it is sent to the client.
- #
- # To parse .shtml files for server-side includes (SSI):
- # (You will also need to add "Includes" to the "Options" directive.)
- #
- AddType text/html .shtml
- AddOutputFilter INCLUDES .shtml
-</IfModule>
-
-#
-# Specify a default charset for all content served; this enables
-# interpretation of all content as UTF-8 by default. To use the
-# default browser choice (ISO-8859-1), or to allow the META tags
-# in HTML content to override this choice, comment out this
-# directive:
-#
-AddDefaultCharset UTF-8
-
-<IfModule mime_magic_module>
- #
- # The mod_mime_magic module allows the server to use various hints from the
- # contents of the file itself to determine its type. The MIMEMagicFile
- # directive tells the module where the hint definitions are located.
- #
- MIMEMagicFile conf/magic
-</IfModule>
-
-#
-# Customizable error responses come in three flavors:
-# 1) plain text 2) local redirects 3) external redirects
-#
-# Some examples:
-#ErrorDocument 500 "The server made a boo boo."
-#ErrorDocument 404 /missing.html
-#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
-#ErrorDocument 402 http://www.example.com/subscription_info.html
-#
-
-#
-# EnableMMAP and EnableSendfile: On systems that support it,
-# memory-mapping or the sendfile syscall may be used to deliver
-# files. This usually improves server performance, but must
-# be turned off when serving from networked-mounted
-# filesystems or if support for these functions is otherwise
-# broken on your system.
-# Defaults if commented: EnableMMAP On, EnableSendfile Off
-#
-#EnableMMAP off
-EnableSendfile on
-
-# Supplemental configuration
-#
-# Load config files in the "/etc/httpd/conf.d" directory, if any.
-IncludeOptional conf.d/*.conf
http://git-wip-us.apache.org/repos/asf/airavata/blob/e0110cbb/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
new file mode 100644
index 0000000..82d67fc
--- /dev/null
+++ b/dev-tools/ansible/roles/pga/templates/pga-vhost.conf.j2
@@ -0,0 +1,11 @@
+<VirtualHost *:80>
+ ServerName {{ vhost_servername }}
+
+ DocumentRoot {{ doc_root_dir }}
+ <Directory "{{ doc_root_dir }}">
+ 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
+
+</VirtualHost>
[15/50] airavata git commit: using BigInt for derby
Posted by sm...@apache.org.
using BigInt for derby
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/866178a4
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/866178a4
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/866178a4
Branch: refs/heads/master
Commit: 866178a41f75df25bb788eb2a8a19cecb9889944
Parents: 520ad04
Author: scnakandala <su...@gmail.com>
Authored: Thu Mar 16 15:26:40 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Thu Mar 16 15:26:40 2017 -0400
----------------------------------------------------------------------
.../src/main/resources/sharing-registry-mysql.sql | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/866178a4/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-mysql.sql b/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-mysql.sql
index a90ff81..f3eda86 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-mysql.sql
+++ b/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-mysql.sql
@@ -102,7 +102,7 @@ CREATE TABLE ENTITY (
BINARY_DATA BLOB,
FULL_TEXT TEXT,
ORIGINAL_ENTITY_CREATION_TIME BIGINT NOT NULL,
- SHARED_COUNT INT DEFAULT 0,
+ SHARED_COUNT BIGINT DEFAULT 0,
CREATED_TIME BIGINT NOT NULL,
UPDATED_TIME BIGINT NOT NULL,
PRIMARY KEY (ENTITY_ID, DOMAIN_ID),
[14/50] airavata git commit: using BigInt for derby
Posted by sm...@apache.org.
using BigInt for derby
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/520ad04f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/520ad04f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/520ad04f
Branch: refs/heads/master
Commit: 520ad04f75fbb07afccba3fef515c8307eaba921
Parents: ae139ff
Author: scnakandala <su...@gmail.com>
Authored: Thu Mar 16 15:25:20 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Thu Mar 16 15:25:20 2017 -0400
----------------------------------------------------------------------
.../src/main/resources/sharing-registry-derby.sql | 2 +-
.../org/apache/airavata/sharing/registry/CipresTest.java | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/520ad04f/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql b/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql
index 947742f..2a9c82d 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql
+++ b/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql
@@ -102,7 +102,7 @@ CREATE TABLE ENTITY (
BINARY_DATA BLOB,
FULL_TEXT VARCHAR(255),
ORIGINAL_ENTITY_CREATION_TIME BIGINT NOT NULL,
- SHARED_COUNT INT DEFAULT 0,
+ SHARED_COUNT BIGINT DEFAULT 0,
CREATED_TIME BIGINT NOT NULL,
UPDATED_TIME BIGINT NOT NULL,
PRIMARY KEY (ENTITY_ID, DOMAIN_ID),
http://git-wip-us.apache.org/repos/asf/airavata/blob/520ad04f/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/CipresTest.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/CipresTest.java b/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/CipresTest.java
index 8ca65b4..e12664f 100644
--- a/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/CipresTest.java
+++ b/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/CipresTest.java
@@ -21,6 +21,7 @@
package org.apache.airavata.sharing.registry;
import org.apache.airavata.sharing.registry.models.*;
+import org.apache.airavata.sharing.registry.server.ServerMain;
import org.apache.airavata.sharing.registry.service.cpi.SharingRegistryService;
import org.apache.thrift.TException;
import org.apache.thrift.protocol.TBinaryProtocol;
@@ -36,11 +37,16 @@ public class CipresTest {
public static void main(String[] args) throws InterruptedException {
System.out.println("Hello World!");
//should use the correct host name and port here
- String serverHost = "wb-airavata.scigap.org";
+// String serverHost = "wb-airavata.scigap.org";
+ String serverHost = "localhost";
int serverPort = 7878;
TTransport transport = null;
+ ServerMain serverMain = new ServerMain();
+ serverMain.main(new String[]{});
+ Thread.sleep(1000 * 2);
+
try {
transport = new TSocket(serverHost, serverPort);
transport.open();
[05/50] airavata git commit: AIRAVATA-2335 SEAgrid PGA deployment to
Jetstream
Posted by sm...@apache.org.
AIRAVATA-2335 SEAgrid PGA deployment to Jetstream
Note: some of the pga variables are encrypted
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2a41071d
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2a41071d
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2a41071d
Branch: refs/heads/master
Commit: 2a41071dda3916c8dbfd5269164fa6b02df7b0f8
Parents: 852a4fe
Author: Marcus Christie <ma...@apache.org>
Authored: Wed Mar 8 12:11:07 2017 -0500
Committer: Marcus Christie <ma...@apache.org>
Committed: Wed Mar 8 12:11:07 2017 -0500
----------------------------------------------------------------------
dev-tools/ansible/.gitignore | 1 +
.../testing-0.17/group_vars/pga/vars.yml | 31 ++++++++++++++++++++
.../testing-0.17/group_vars/pga/vault.yml | 18 ++++++++++++
.../ansible/inventories/testing-0.17/hosts | 3 ++
dev-tools/ansible/pga.yml | 8 +++++
.../roles/pga/templates/pga_config.php.j2 | 8 +++++
6 files changed, 69 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/2a41071d/dev-tools/ansible/.gitignore
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/.gitignore b/dev-tools/ansible/.gitignore
index a8b42eb..982f5b2 100644
--- a/dev-tools/ansible/.gitignore
+++ b/dev-tools/ansible/.gitignore
@@ -1 +1,2 @@
*.retry
+vault-password.txt
http://git-wip-us.apache.org/repos/asf/airavata/blob/2a41071d/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
new file mode 100644
index 0000000..dffd691
--- /dev/null
+++ b/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vars.yml
@@ -0,0 +1,31 @@
+---
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+pga_git_branch: "develop"
+pga_user: "pga"
+pga_group: "pga"
+doc_root_dir: "/var/www/html/php-gateway"
+user_data_dir: "/var/www/user_data"
+
+## 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 }}"
+
+## Airavata Client related variables
+#airavata_server: "tls://gw77.iu.xsede.org"
+airavata_server: "{{ groups['api-orch'][0] }}"
+airavata_port: "8930"
+gateway_id: "seagrid"
+# 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"
+
+## 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 }}"
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/2a41071d/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
new file mode 100644
index 0000000..b253227
--- /dev/null
+++ b/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/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/2a41071d/dev-tools/ansible/inventories/testing-0.17/hosts
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17/hosts b/dev-tools/ansible/inventories/testing-0.17/hosts
index b392006..27f378f 100644
--- a/dev-tools/ansible/inventories/testing-0.17/hosts
+++ b/dev-tools/ansible/inventories/testing-0.17/hosts
@@ -18,3 +18,6 @@
# needs to be here as a workaround
[registry]
149.165.168.5 ansible_user=centos
+
+[pga]
+149.165.156.102 ansible_user=centos
http://git-wip-us.apache.org/repos/asf/airavata/blob/2a41071d/dev-tools/ansible/pga.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/pga.yml b/dev-tools/ansible/pga.yml
new file mode 100644
index 0000000..88edadc
--- /dev/null
+++ b/dev-tools/ansible/pga.yml
@@ -0,0 +1,8 @@
+---
+- hosts: pga
+ tags: pga
+ roles:
+ - env_setup
+ - pga
+
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/2a41071d/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 c71308d..aa320a7 100644
--- a/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
+++ b/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
@@ -24,6 +24,14 @@ return array(
'user-role-name' => 'gateway-user',
/**
+ * Initial user role. This is the initial user role assigned to a new
+ * user. Set this to one of the three roles above to automatically
+ * 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',
+
+ /**
* Tenant Domain
*/
'tenant-domain' => '{{ tenant_domain }}',
[18/50] airavata git commit: changing the order
Posted by sm...@apache.org.
changing the order
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/0c8c2ae0
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/0c8c2ae0
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/0c8c2ae0
Branch: refs/heads/master
Commit: 0c8c2ae00d031c36135fb61302b0d30c2310d5e1
Parents: a135c82
Author: scnakandala <su...@gmail.com>
Authored: Thu Mar 16 15:49:52 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Thu Mar 16 15:49:52 2017 -0400
----------------------------------------------------------------------
.../org/apache/airavata/sharing/registry/CipresTest.java | 8 +-------
.../sharing/registry/SharingRegistryServiceTest.java | 3 ++-
2 files changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/0c8c2ae0/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/CipresTest.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/CipresTest.java b/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/CipresTest.java
index e12664f..8ca65b4 100644
--- a/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/CipresTest.java
+++ b/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/CipresTest.java
@@ -21,7 +21,6 @@
package org.apache.airavata.sharing.registry;
import org.apache.airavata.sharing.registry.models.*;
-import org.apache.airavata.sharing.registry.server.ServerMain;
import org.apache.airavata.sharing.registry.service.cpi.SharingRegistryService;
import org.apache.thrift.TException;
import org.apache.thrift.protocol.TBinaryProtocol;
@@ -37,16 +36,11 @@ public class CipresTest {
public static void main(String[] args) throws InterruptedException {
System.out.println("Hello World!");
//should use the correct host name and port here
-// String serverHost = "wb-airavata.scigap.org";
- String serverHost = "localhost";
+ String serverHost = "wb-airavata.scigap.org";
int serverPort = 7878;
TTransport transport = null;
- ServerMain serverMain = new ServerMain();
- serverMain.main(new String[]{});
- Thread.sleep(1000 * 2);
-
try {
transport = new TSocket(serverHost, serverPort);
transport.open();
http://git-wip-us.apache.org/repos/asf/airavata/blob/0c8c2ae0/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java b/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java
index 112500e..15a84c6 100644
--- a/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java
+++ b/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java
@@ -28,6 +28,7 @@ import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.transport.TSocket;
import org.apache.thrift.transport.TTransport;
+import org.databene.contiperf.PerfTest;
import org.databene.contiperf.junit.ContiPerfRule;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -54,7 +55,7 @@ public class SharingRegistryServiceTest {
@Test
-// @PerfTest(invocations = 50, threads = 10)
+ @PerfTest(invocations = 50, threads = 10)
public void test() throws TException, InterruptedException {
String serverHost = "localhost";
int serverPort = 7878;
[48/50] airavata git commit: AIRAVATA-2335 Deploy different keystores
based on environment
Posted by sm...@apache.org.
AIRAVATA-2335 Deploy different keystores based on environment
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/570bc5d1
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/570bc5d1
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/570bc5d1
Branch: refs/heads/master
Commit: 570bc5d1b4c48483f61b0ff6cbc143f8b4c2b77d
Parents: b45bac6
Author: Marcus Christie <ma...@apache.org>
Authored: Fri Mar 31 09:29:47 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Fri Mar 31 09:29:47 2017 -0400
----------------------------------------------------------------------
dev-tools/ansible/ansible.cfg | 2 +
.../inventories/testing-0.17/files/airavata.jks | 76 ++++++++++++++++++++
.../testing-0.17/files/airavata_sym.jks | 30 ++++++++
.../testing-0.17/group_vars/all/vars.yml | 7 +-
.../templates/airavata-server.properties.j2 | 6 +-
.../ansible/roles/common/defaults/main.yml | 3 +
dev-tools/ansible/roles/common/tasks/main.yml | 12 ++--
.../templates/airavata-server.properties.j2 | 6 +-
8 files changed, 126 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/570bc5d1/dev-tools/ansible/ansible.cfg
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/ansible.cfg b/dev-tools/ansible/ansible.cfg
new file mode 100644
index 0000000..9af1301
--- /dev/null
+++ b/dev-tools/ansible/ansible.cfg
@@ -0,0 +1,2 @@
+[defaults]
+inventory_ignore_extensions = .jks
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/570bc5d1/dev-tools/ansible/inventories/testing-0.17/files/airavata.jks
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17/files/airavata.jks b/dev-tools/ansible/inventories/testing-0.17/files/airavata.jks
new file mode 100644
index 0000000..4124c40
--- /dev/null
+++ b/dev-tools/ansible/inventories/testing-0.17/files/airavata.jks
@@ -0,0 +1,76 @@
+$ANSIBLE_VAULT;1.1;AES256
+32656330396637356236343162313734356339656337633933323238656630646566366533646333
+3139613434336665386532326136353266373839376563630a313865376639663637643130386364
+65313436343330303437613639653833333530383130383266643963336334373366353062393762
+6534303635313039320a643139666331343435303037356139663235613437653235326666396132
+38376233343461656232353963306362383435323061623164623135613538376161656533306464
+64613637303666323439306466666266363764306133346132393931383631393964363864343037
+31353737323039303961643933316164653635326333633930343665616135646338386661316231
+31303462366239326664326139353433343232363061363464356236353938343338306562363864
+30616137343539656237303030343863613432646366383232396262373538663030666332303061
+38383630613535663332323830303130313039393430656666316361383335326164393138393062
+37663535326533333239613364656638313239663365353261633934656132633732333332366337
+35613733666466363662633363633530376133663436653462656538346134353965303561643031
+65376462663964323137356264303831383933303862393435313633333337303635336133613932
+35356439326431353932333839643433326430653638626231663733326464643338323639656334
+31363433656163643136396132633766343937313331363537353930643331346135643663373535
+65343164313065396634636330626130643165336365663166343035363238316630626433653032
+65323561366363366561396562346533653135623565666166373230303862376463316637313734
+39373166626633626266306538373138303131343665316165346530363061656130333739363865
+31326631316130306331353034306663643531646635373638356164613333353536356634346236
+30663034613936303861636561633761663335326534393236646633333261663136643831396637
+62326135646265306662336239326363613736323162633933326636303536633263323437373262
+63393438623834626337626438393332353838316336666136663364353431623530653633626561
+66646238323238643963653162323136636265396333313236626632353237393565363462633734
+33666533303132306563346538393433663161623832613065346136376532343131383830353438
+65306235336534313733393238646235616366383035303566616330633437393132363262316337
+38626135626537353664376133323466373939323638616630633538663533313061373763373535
+33343564623963613336396463333361383534333735353261353639373435393466346131356562
+33366262376533393161613932343938396136663532373231626362356663386263613332323539
+38613666356430653537326663303331613431353434663737323935326566656461653630306436
+66393337323938373030616563373639623665653332643335653861643034346239666337336132
+31663463343530313964303232633662383535313436626361313236653466353538313663636235
+31316261323134646639383865613434643762346562323337333662306162333936373863656135
+35666462653631366136623137613131333962363030646531396366633030666632376439373036
+35393932633333653535363266626665363662663237303766666332326161306666333061646231
+37626637653365343962653336326332353739333664393831653132636431656439633134383139
+64363035353236333835393932616263346334346162376261643931396137656338373437643736
+37643364616264306531616534396332303932636336656434376663393265636135346262346562
+36633833393265356530646633343866646635643932336430363634313237363637653965633438
+32323534383164376563323136666533373338333766343663326566613364636136303461393232
+65306635326663633836386166383564363832356166616439373833346561623436373635393533
+34393930393764393363363330646161346331376636666132656662626434353338343861373964
+66633561396338306339393665633565643366666130643235613732626637643133656465316264
+37306230323665343730363761643637336665313437366366346139643137313165623339663436
+61663863366134666163616438326639636132643331613265353831383134356133376131333538
+30663132306633646264333931656233613039353830363135396364383730663133313730323739
+38336537663830333466663033653361636332303534356630333730303731613539633635636230
+33326233663763653039303131656437326361306537396130353162373333616339363930363637
+38333963306235333837303361386332383762306130393338373034633334313835613565623865
+32333330616337656566346231393636363061326364633136626539313634396337636661313838
+34636464303863636639666231363965316336646461383234656161663035366330643039386266
+62343564353835386637626165663438353739386538326463303832633765323563383036386437
+32633065303532303631356236383862316563346237653562393033623035636431343138646237
+62386463353862643865333836613938653561316335366563323338643834616634383361346162
+61343436356638333965396238623639303631386363373432323032636139633962366262316438
+33313065653130366235613133303130306362623133386239323637626561643536653830663038
+36363463313838366461626639636139616462336335373438613230663536346332656436653235
+61316439343731646631663133393065313462643230643162313462343365656431363438613933
+65343032653038633330653734356439353537363236343163623138333836663862383035373537
+31626136363232666362613036366536323533386534366264636131656362373963643137333830
+34373039653939313863303736643761376332313161343232323863323832313631366138396661
+64323638383532333263316132303538376631396637656463366430343865633061363636373834
+33373163376239356433373230323561343830326434316661346433323233353933313632666533
+63626130393866653866656231386532373461346236653363653338396165663431383438386166
+63636230643439626337386638613662646636326435313937623334333933303431653335663333
+35313935613034353865383633643334333865386262353632353632383933636161343638303033
+66373037353435386263396664333335323932616137653839323133323032386265306562393561
+64643831353835366365623531626661626466366563666431396233396634353731613033376265
+65366231653562393233386231333435366438663932393962326464666161643666303932306132
+35383338333533343133636662316635343531303535383237653866353563623333333838383138
+33333439383661666637306531313865343164653633323962346430653762386230313035336664
+63336634633434346164313664613539613832643939633331643132363232396637376234353539
+32653136363135646431376131373632353363383239303536343865373632366337333261353935
+34323466396430363830303332376434343534623037613862323732336566623366333861373134
+64373535336133616537613362646164366237343433363838663731353961376538346534646337
+373637313538306332616430383839623432
http://git-wip-us.apache.org/repos/asf/airavata/blob/570bc5d1/dev-tools/ansible/inventories/testing-0.17/files/airavata_sym.jks
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17/files/airavata_sym.jks b/dev-tools/ansible/inventories/testing-0.17/files/airavata_sym.jks
new file mode 100644
index 0000000..13ccf1b
--- /dev/null
+++ b/dev-tools/ansible/inventories/testing-0.17/files/airavata_sym.jks
@@ -0,0 +1,30 @@
+$ANSIBLE_VAULT;1.1;AES256
+66393935613465373265366662383133353632633262353839623837636364373339336564636265
+3862663231313565313064643833646530636361333866610a636266666561306263343632663734
+33306432363830323132653038326139323464393065313631373936346162386161626461396530
+3061376439346264310a346630616535326435626235393564643062326665313239373839336331
+38316134613764373336333338323263356563396638303932656562336538333137643131373366
+35653334383566313262336261623339626532333634363531313534353762356534643961646338
+34633938333436333135643736663437373532633061366464343632643366343337366262386465
+33373333333033303262316566346565613731633361333438363063616165333231323635646333
+34303463656431663932326464356332353235336238653462663463373332656231373562626664
+65346131663064376232643435653264383465323761373063366162663236323935373139386138
+39623734643064623635376261646465383663613238623531613066306464326662346532346365
+63623064383436303634393639316638366136653563663930303130643531373166613133653338
+36636433626539366661656164613032653931356561336336343561323962336462383164393463
+65353265363535616136306136353064346561666439663532626234363763653535663061386232
+61663566343361666634346134623538366664396236346365336431383937653761643235613661
+32373439656332306536623336343763386364363265306138356138616464656662363434636531
+30646163333462636236336532383964643234616131663465666663633333343366376134666263
+63353161336366613065303434656537396237643938376233333431663232356630373038333835
+37306162623439323062626532656633646138386131643037323566643264653432633735333362
+65613564393232393433646334376639356564376661663430353630626534336566663061303632
+64633235333463626435323134636333353536393936663539663539336233363934333931323961
+63313739333733613465376334336239306633636136383831396533326530616133373366653531
+33356137656636323037303430623065393930633731346634346161633334313362613136313138
+36633835353665626462363031653161646530366339363732373865343136356637326631386437
+30383235306538303261613262376634303164313862366330393463346261363866346336666136
+37333566396436383534633330316465306461383537616661343265663731363561323137303164
+36336532333233343463633064346162646562613332646331343931363838333739636335376331
+66626436313938346362303932336339636434666665373862306462646162393066303338383265
+64363138663564386332383032366265666565643633393236663830313936343637
http://git-wip-us.apache.org/repos/asf/airavata/blob/570bc5d1/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vars.yml b/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vars.yml
index 3229580..d17dfe0 100644
--- a/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vars.yml
@@ -64,12 +64,11 @@ default_gateway: "php_reference_gateway"
# Credential and keystore related variables
#authorization_server: "https://{{ groups['wso2is'][0]}}:9443/services/"
authorization_server: "https://idp.scigap.org:9443/services/"
-keystore: "airavata.jks"
+keystore_src_path: "{{inventory_dir}}/files/airavata.jks"
keystore_passwd: "airavata"
-#client_truststore: "client_truststore.jks"
-client_truststore: "airavata.jks"
+client_truststore_src_path: "{{inventory_dir}}/files/airavata.jks"
client_truststore_passwd: "airavata"
-cred_keystore: "airavata_sym.jks"
+cred_keystore_src_path: "{{inventory_dir}}/files/airavata_sym.jks"
cred_keystore_passwd: "airavata"
cred_keystore_alias: "airavata"
cred_store_server_host: "{{ ansible_fqdn }}"
http://git-wip-us.apache.org/repos/asf/airavata/blob/570bc5d1/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 cb69c9f..2cd5013 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
@@ -201,7 +201,7 @@ job.notification.flags=abe
###########################################################################
# Credential Store module Configuration
###########################################################################
-credential.store.keystore.url={{ keystores_location }}/{{ cred_keystore }}
+credential.store.keystore.url={{ keystores_location }}/{{ cred_keystore_src_path | basename }}
credential.store.keystore.alias={{ cred_keystore_alias }}
credential.store.keystore.password={{ cred_keystore_passwd }}
credential.store.jdbc.url=jdbc:mysql://{{ db_server }}:3306/{{ credential_store }}
@@ -291,10 +291,10 @@ TLS.enabled={{ tls_enable }}
TLS.api.server.port={{ api_server_tls_port }}
TLS.client.timeout=10000
#### keystore configuration ####
-keystore.path={{ keystores_location }}/{{ keystore }}
+keystore.path={{ keystores_location }}/{{ keystore_src_path | basename }}
keystore.password={{ keystore_passwd }}
#### trust store configuration ####
-trust.store={{ keystores_location }}/{{ client_truststore }}
+trust.store={{ keystores_location }}/{{ client_truststore_src_path | basename }}
trust.store.password=airavata
#### remote authorization server url ####
remote.oauth.authorization.server=https://idp.scigap.org:9443/services/
http://git-wip-us.apache.org/repos/asf/airavata/blob/570bc5d1/dev-tools/ansible/roles/common/defaults/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/common/defaults/main.yml b/dev-tools/ansible/roles/common/defaults/main.yml
new file mode 100644
index 0000000..9b0340e
--- /dev/null
+++ b/dev-tools/ansible/roles/common/defaults/main.yml
@@ -0,0 +1,3 @@
+keystore_src_path: "airavata.jks"
+client_truststore_src_path: "airavata.jks"
+cred_keystore_src_path: "airavata_sym.jks"
http://git-wip-us.apache.org/repos/asf/airavata/blob/570bc5d1/dev-tools/ansible/roles/common/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/common/tasks/main.yml b/dev-tools/ansible/roles/common/tasks/main.yml
index eac1a60..e46cba4 100644
--- a/dev-tools/ansible/roles/common/tasks/main.yml
+++ b/dev-tools/ansible/roles/common/tasks/main.yml
@@ -40,16 +40,16 @@
owner={{ user }} group={{ group }}
- name: Transfer airavata.jks KeyStore file
- copy: src={{ keystore }}
- dest="{{ keystores_location }}/{{ keystore }}"
+ copy: src={{ keystore_src_path }}
+ dest="{{ keystores_location }}/{{ keystore_src_path | basename }}"
owner={{ user }} group={{ group }}
- name: Transfer airavata_sym.jks KeyStore file
- copy: src={{ cred_keystore }}
- dest="{{ keystores_location }}/{{ cred_keystore }}"
+ copy: src={{ cred_keystore_src_path }}
+ dest="{{ keystores_location }}/{{ cred_keystore_src_path | basename }}"
owner={{ user }} group={{ group }}
- name: Transfer client trust store KeyStore file
- copy: src={{ client_truststore }}
- dest="{{ keystores_location }}/{{ client_truststore }}"
+ copy: src={{ client_truststore_src_path }}
+ dest="{{ keystores_location }}/{{ client_truststore_src_path | basename }}"
owner={{ user }} group={{ group }}
http://git-wip-us.apache.org/repos/asf/airavata/blob/570bc5d1/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 bf92e39..bf6f536 100644
--- a/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2
+++ b/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2
@@ -189,7 +189,7 @@ job.notification.flags=abe
###########################################################################
# Credential Store module Configuration
###########################################################################
-credential.store.keystore.url={{ keystores_location }}/{{ cred_keystore }}
+credential.store.keystore.url={{ keystores_location }}/{{ cred_keystore_src_path | basename }}
credential.store.keystore.alias={{ cred_keystore_alias }}
credential.store.keystore.password={{ cred_keystore_passwd }}
credential.store.jdbc.url=jdbc:mysql://{{ db_server }}:3306/{{ credential_store }}
@@ -279,10 +279,10 @@ TLS.enabled={{ tls_enable }}
TLS.api.server.port={{ api_server_tls_port }}
TLS.client.timeout=10000
#### keystore configuration ####
-keystore.path={{ keystores_location }}/{{ keystore }}
+keystore.path={{ keystores_location }}/{{ keystore_src_path | basename }}
keystore.password={{ keystore_passwd }}
#### trust store configuration ####
-trust.store={{ keystores_location }}/{{ client_truststore }}
+trust.store={{ keystores_location }}/{{ client_truststore_src_path | basename }}
trust.store.password=airavata
#### remote authorization server url ####
remote.oauth.authorization.server=https://idp.scigap.org:9443/services/
[41/50] airavata git commit: AIRAVATA-2349 Fixing column typo
Posted by sm...@apache.org.
AIRAVATA-2349 Fixing column typo
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5a92edae
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5a92edae
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5a92edae
Branch: refs/heads/master
Commit: 5a92edae0b5b0eded0421d63fe9681a03c668ebc
Parents: 4066b6c
Author: Marcus Christie <ma...@apache.org>
Authored: Mon Mar 27 13:49:43 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Mon Mar 27 13:49:43 2017 -0400
----------------------------------------------------------------------
.../airavata/credential/store/store/impl/db/CredentialsDAO.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a92edae/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/db/CredentialsDAO.java
----------------------------------------------------------------------
diff --git a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/db/CredentialsDAO.java b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/db/CredentialsDAO.java
index 7a13539..e791f32 100644
--- a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/db/CredentialsDAO.java
+++ b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/db/CredentialsDAO.java
@@ -87,7 +87,7 @@ public class CredentialsDAO extends ParentDAO {
public void addCredentials(String gatewayId, Credential credential, Connection connection)
throws CredentialStoreException {
- String sql = "INSERT INTO CREDENTIALS (GATEWAY_ID, TOKEN_ID, BLOB, PORTAL_USER_ID, TIME_PERSISTED, DESCRIPTION, CREDENTIAL_OWNER_TYPE) VALUES (?, ?, ?, ?, ?, ?, ?)";
+ String sql = "INSERT INTO CREDENTIALS (GATEWAY_ID, TOKEN_ID, CREDENTIAL, PORTAL_USER_ID, TIME_PERSISTED, DESCRIPTION, CREDENTIAL_OWNER_TYPE) VALUES (?, ?, ?, ?, ?, ?, ?)";
PreparedStatement preparedStatement = null;
[35/50] airavata git commit: undoing the last commit
Posted by sm...@apache.org.
undoing the last commit
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/668b54da
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/668b54da
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/668b54da
Branch: refs/heads/master
Commit: 668b54daa644fa7f8c38fca5e0e4cbf34586340d
Parents: 118c7bc
Author: scnakandala <su...@gmail.com>
Authored: Thu Mar 23 16:52:49 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Thu Mar 23 16:52:49 2017 -0400
----------------------------------------------------------------------
.../airavata/api/server/handler/AiravataServerHandler.java | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/668b54da/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index 3cabf3c..d2e041d 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -4662,16 +4662,10 @@ public class AiravataServerHandler implements Airavata.Iface {
sharingClient.getListOfSharedUsers(authzToken.getClaimsMap().get(Constants.GATEWAY_ID),
resourceId, authzToken.getClaimsMap().get(Constants.GATEWAY_ID)
+ ":WRITE").stream().forEach(u -> accessibleUsers.add(u.userId));
- sharingClient.getListOfSharedUsers(authzToken.getClaimsMap().get(Constants.GATEWAY_ID),
- resourceId, authzToken.getClaimsMap().get(Constants.GATEWAY_ID)
- + ":OWNER").stream().forEach(u -> accessibleUsers.add(u.userId));
} else if (permissionType.equals(ResourcePermissionType.READ)) {
sharingClient.getListOfSharedUsers(authzToken.getClaimsMap().get(Constants.GATEWAY_ID),
resourceId, authzToken.getClaimsMap().get(Constants.GATEWAY_ID)
+ ":READ").stream().forEach(u -> accessibleUsers.add(u.userId));
- sharingClient.getListOfSharedUsers(authzToken.getClaimsMap().get(Constants.GATEWAY_ID),
- resourceId, authzToken.getClaimsMap().get(Constants.GATEWAY_ID)
- + ":OWNER").stream().forEach(u -> accessibleUsers.add(u.userId));
} else if (permissionType.equals(ResourcePermissionType.OWNER)) {
sharingClient.getListOfSharedUsers(authzToken.getClaimsMap().get(Constants.GATEWAY_ID),
resourceId, authzToken.getClaimsMap().get(Constants.GATEWAY_ID)
[04/50] airavata git commit: AIRAVATA-2335 Moved pga vars -> defaults
to allow overriding
Posted by sm...@apache.org.
AIRAVATA-2335 Moved pga vars -> defaults to allow overriding
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/852a4fe4
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/852a4fe4
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/852a4fe4
Branch: refs/heads/master
Commit: 852a4fe4359c6dbc9468610332cf02a2aba7ce50
Parents: 60a3223
Author: Marcus Christie <ma...@apache.org>
Authored: Wed Mar 8 10:27:19 2017 -0500
Committer: Marcus Christie <ma...@apache.org>
Committed: Wed Mar 8 10:27:19 2017 -0500
----------------------------------------------------------------------
dev-tools/ansible/roles/pga/defaults/main.yml | 35 ++++++++++++++++++++++
dev-tools/ansible/roles/pga/vars/main.yml | 35 ----------------------
2 files changed, 35 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/852a4fe4/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
new file mode 100644
index 0000000..0ea3ce1
--- /dev/null
+++ b/dev-tools/ansible/roles/pga/defaults/main.yml
@@ -0,0 +1,35 @@
+---
+pga_user: "pga"
+pga_group: "pga"
+doc_root_dir: "/var/www/html/php-gateway"
+user_data_dir: "/var/www/user_data"
+#httpd_conf_file: "/etc/httpd/conf/httpd.conf"
+httpd_conf_file_location:
+ RedHat: "/etc/httpd/conf/httpd.conf"
+ Debian: "/etc/apache2/apache2.conf"
+httpd_name:
+ Debian: apache2
+ RedHat: httpd
+
+## WSO2 IS related variables
+tenant_domain: "prod.testdrive"
+admin_username: "tdaadmin"
+admin_password: "SciDeploy"
+oauth_client_key: "RuLl_Uw7i_KXaLoAGJkiasTfyBYa"
+oauth_client_secret: "vD9yi2ANkChzgWiih3RahrIcfsoa"
+
+## Airavata Client related variables
+#airavata_server: "tls://gw77.iu.xsede.org"
+airavata_server: "{{ groups['api-orch'][0] }}"
+airavata_port: "8930"
+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"
+
+## Portal related variables
+super_admin_portal: "true"
+admin_emails: "'sgg@iu.edu'"
+portal_email_username: "pga.airavata@gmail.com"
+portal_email_password: "airavata12"
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/852a4fe4/dev-tools/ansible/roles/pga/vars/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/vars/main.yml b/dev-tools/ansible/roles/pga/vars/main.yml
deleted file mode 100644
index a47212d..0000000
--- a/dev-tools/ansible/roles/pga/vars/main.yml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-pga_user: "pga"
-pga_group: "pga"
-doc_root_dir: "/var/www/html/php-gateway"
-user_data_dir: "/var/www/user_data"
-#httpd_conf_file: "/etc/httpd/conf/httpd.conf"
-httpd_conf_file_location:
- RedHat: "/etc/httpd/conf/httpd.conf"
- Debian: "/etc/apache2/apache2.conf"
-httpd_name:
- Debian: apache2
- RedHat: httpd
-
-## WSO2 IS related variables
-tenant_domain: "prod.testdrive"
-admin_username: "tdaadmin"
-admin_password: "SciDeploy"
-oauth_client_key: "RuLl_Uw7i_KXaLoAGJkiasTfyBYa"
-oauth_client_secret: "vD9yi2ANkChzgWiih3RahrIcfsoa"
-
-## Airavata Client related variables
-#airavata_server: "tls://gw77.iu.xsede.org"
-airavata_server: "{{ groups['api-orch'][0] }}"
-airavata_port: "8930"
-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"
-
-## Portal related variables
-super_admin_portal: "true"
-admin_emails: "'sgg@iu.edu'"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "airavata12"
-...
[33/50] airavata git commit: fixing issues in the sharing data
migrator
Posted by sm...@apache.org.
fixing issues in the sharing data migrator
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f4edced9
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f4edced9
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f4edced9
Branch: refs/heads/master
Commit: f4edced90812ea8310b60449efdcb9973848bad1
Parents: 3a0b061
Author: scnakandala <su...@gmail.com>
Authored: Thu Mar 23 15:23:18 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Thu Mar 23 15:23:18 2017 -0400
----------------------------------------------------------------------
.../registry/migrator/airavata/AiravataDataMigrator.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/f4edced9/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java b/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java
index d11abbf..ece75aa 100644
--- a/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java
+++ b/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java
@@ -47,6 +47,7 @@ public class AiravataDataMigrator {
try{
//Creating domain entries
Domain domain = new Domain();
+ domain.setDomainId(rs.getString("GATEWAY_ID"));
domain.setName(rs.getString("GATEWAY_ID"));
domain.setDescription("Domain entry for " + domain.name);
@@ -84,7 +85,7 @@ public class AiravataDataMigrator {
permissionType.setDomainId(domain.domainId);
permissionType.setName("READ");
permissionType.setDescription("Read permission type");
- if (!sharingRegistryServerHandler.isEntityTypeExists(entityType.domainId, entityType.entityTypeId))
+ if (!sharingRegistryServerHandler.isPermissionExists(permissionType.domainId, permissionType.permissionTypeId))
sharingRegistryServerHandler.createPermissionType(permissionType);
permissionType = new PermissionType();
@@ -92,7 +93,7 @@ public class AiravataDataMigrator {
permissionType.setDomainId(domain.domainId);
permissionType.setName("WRITE");
permissionType.setDescription("Write permission type");
- if (!sharingRegistryServerHandler.isEntityTypeExists(entityType.domainId, entityType.entityTypeId))
+ if (!sharingRegistryServerHandler.isPermissionExists(permissionType.domainId, permissionType.permissionTypeId))
sharingRegistryServerHandler.createPermissionType(permissionType);
}catch (Exception ex){
ex.printStackTrace();
[40/50] airavata git commit: AIRAVATA-2335 Making order of
CREDENTIALS columns explicit instead of relying on database default ordering
Posted by sm...@apache.org.
AIRAVATA-2335 Making order of CREDENTIALS columns explicit instead of relying on database default ordering
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/4066b6cc
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/4066b6cc
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/4066b6cc
Branch: refs/heads/master
Commit: 4066b6ccca98bce862bd8d726eb5d8d72e890196
Parents: 41cc920
Author: Marcus Christie <ma...@apache.org>
Authored: Mon Mar 27 13:36:27 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Mon Mar 27 13:36:27 2017 -0400
----------------------------------------------------------------------
.../airavata/credential/store/store/impl/db/CredentialsDAO.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/4066b6cc/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/db/CredentialsDAO.java
----------------------------------------------------------------------
diff --git a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/db/CredentialsDAO.java b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/db/CredentialsDAO.java
index 7770590..7a13539 100644
--- a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/db/CredentialsDAO.java
+++ b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/db/CredentialsDAO.java
@@ -87,7 +87,7 @@ public class CredentialsDAO extends ParentDAO {
public void addCredentials(String gatewayId, Credential credential, Connection connection)
throws CredentialStoreException {
- String sql = "INSERT INTO CREDENTIALS VALUES (?, ?, ?, ?, ?, ?, ?)";
+ String sql = "INSERT INTO CREDENTIALS (GATEWAY_ID, TOKEN_ID, BLOB, PORTAL_USER_ID, TIME_PERSISTED, DESCRIPTION, CREDENTIAL_OWNER_TYPE) VALUES (?, ?, ?, ?, ?, ?, ?)";
PreparedStatement preparedStatement = null;
[36/50] airavata git commit: setting shared count as long
Posted by sm...@apache.org.
setting shared count as long
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/bfc3a84c
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/bfc3a84c
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/bfc3a84c
Branch: refs/heads/master
Commit: bfc3a84c745eefce1e89290e7319210b549de3b2
Parents: 668b54d
Author: scnakandala <su...@gmail.com>
Authored: Thu Mar 23 16:58:05 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Thu Mar 23 16:58:05 2017 -0400
----------------------------------------------------------------------
.../db/repositories/EntityRepository.java | 2 +-
.../sharing/registry/models/Entity.java | 30 +++++++++-----------
.../api-docs/sharing_models.html | 2 +-
.../thrift_models/sharing_models.thrift | 2 +-
4 files changed, 17 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/bfc3a84c/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
index 15ac97a..6a1faf2 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
@@ -151,7 +151,7 @@ public class EntityRepository extends AbstractRepository<Entity, EntityEntity, E
entity.setDescription((String)(rs[6]));
entity.setBinaryData((byte[]) (rs[7]));
entity.setFullText((String) (rs[8]));
- entity.setSharedCount((int) rs[9]);
+ entity.setSharedCount((long) rs[9]);
entity.setOriginalEntityCreationTime((long) (rs[10]));
entity.setCreatedTime((long) (rs[11]));
entity.setUpdatedTime((long) (rs[12]));
http://git-wip-us.apache.org/repos/asf/airavata/blob/bfc3a84c/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java
index 4dd9aa2..a937c09 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java
@@ -17,7 +17,6 @@ import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
-
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -31,7 +30,6 @@ import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
import javax.annotation.Generated;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -53,7 +51,7 @@ import org.slf4j.LoggerFactory;
* <li>updatedTime : Will be set by the system</li>
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2017-03-23")
public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>, java.io.Serializable, Cloneable, Comparable<Entity> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Entity");
@@ -66,7 +64,7 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
private static final org.apache.thrift.protocol.TField DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("description", org.apache.thrift.protocol.TType.STRING, (short)7);
private static final org.apache.thrift.protocol.TField BINARY_DATA_FIELD_DESC = new org.apache.thrift.protocol.TField("binaryData", org.apache.thrift.protocol.TType.STRING, (short)8);
private static final org.apache.thrift.protocol.TField FULL_TEXT_FIELD_DESC = new org.apache.thrift.protocol.TField("fullText", org.apache.thrift.protocol.TType.STRING, (short)9);
- private static final org.apache.thrift.protocol.TField SHARED_COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("sharedCount", org.apache.thrift.protocol.TType.I32, (short) 10);
+ private static final org.apache.thrift.protocol.TField SHARED_COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("sharedCount", org.apache.thrift.protocol.TType.I64, (short) 10);
private static final org.apache.thrift.protocol.TField ORIGINAL_ENTITY_CREATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("originalEntityCreationTime", org.apache.thrift.protocol.TType.I64, (short) 11);
private static final org.apache.thrift.protocol.TField CREATED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("createdTime", org.apache.thrift.protocol.TType.I64, (short)12);
private static final org.apache.thrift.protocol.TField UPDATED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("updatedTime", org.apache.thrift.protocol.TType.I64, (short)13);
@@ -86,7 +84,7 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
public String description; // optional
public ByteBuffer binaryData; // optional
public String fullText; // optional
- public int sharedCount; // optional
+ public long sharedCount; // optional
public long originalEntityCreationTime; // optional
public long createdTime; // optional
public long updatedTime; // optional
@@ -214,7 +212,7 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
tmpMap.put(_Fields.FULL_TEXT, new org.apache.thrift.meta_data.FieldMetaData("fullText", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.SHARED_COUNT, new org.apache.thrift.meta_data.FieldMetaData("sharedCount", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
tmpMap.put(_Fields.ORIGINAL_ENTITY_CREATION_TIME, new org.apache.thrift.meta_data.FieldMetaData("originalEntityCreationTime", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
tmpMap.put(_Fields.CREATED_TIME, new org.apache.thrift.meta_data.FieldMetaData("createdTime", org.apache.thrift.TFieldRequirementType.OPTIONAL,
@@ -226,7 +224,7 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
}
public Entity() {
- this.sharedCount = 0;
+ this.sharedCount = 0L;
}
@@ -283,7 +281,7 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
this.description = null;
this.binaryData = null;
this.fullText = null;
- this.sharedCount = 0;
+ this.sharedCount = 0L;
setOriginalEntityCreationTimeIsSet(false);
this.originalEntityCreationTime = 0;
@@ -519,11 +517,11 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
}
}
- public int getSharedCount() {
+ public long getSharedCount() {
return this.sharedCount;
}
- public Entity setSharedCount(int sharedCount) {
+ public Entity setSharedCount(long sharedCount) {
this.sharedCount = sharedCount;
setSharedCountIsSet(true);
return this;
@@ -691,7 +689,7 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
if (value == null) {
unsetSharedCount();
} else {
- setSharedCount((Integer)value);
+ setSharedCount((Long)value);
}
break;
@@ -1398,8 +1396,8 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
}
break;
case 10: // SHARED_COUNT
- if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
- struct.sharedCount = iprot.readI32();
+ if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+ struct.sharedCount = iprot.readI64();
struct.setSharedCountIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -1509,7 +1507,7 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
}
if (struct.isSetSharedCount()) {
oprot.writeFieldBegin(SHARED_COUNT_FIELD_DESC);
- oprot.writeI32(struct.sharedCount);
+ oprot.writeI64(struct.sharedCount);
oprot.writeFieldEnd();
}
if (struct.isSetOriginalEntityCreationTime()) {
@@ -1613,7 +1611,7 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
oprot.writeString(struct.fullText);
}
if (struct.isSetSharedCount()) {
- oprot.writeI32(struct.sharedCount);
+ oprot.writeI64(struct.sharedCount);
}
if (struct.isSetOriginalEntityCreationTime()) {
oprot.writeI64(struct.originalEntityCreationTime);
@@ -1667,7 +1665,7 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
struct.setFullTextIsSet(true);
}
if (incoming.get(9)) {
- struct.sharedCount = iprot.readI32();
+ struct.sharedCount = iprot.readI64();
struct.setSharedCountIsSet(true);
}
if (incoming.get(10)) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/bfc3a84c/modules/sharing-registry/sharing-service-docs/api-docs/sharing_models.html
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-service-docs/api-docs/sharing_models.html b/modules/sharing-registry/sharing-service-docs/api-docs/sharing_models.html
index 3937299..b7e0c46 100644
--- a/modules/sharing-registry/sharing-service-docs/api-docs/sharing_models.html
+++ b/modules/sharing-registry/sharing-service-docs/api-docs/sharing_models.html
@@ -251,7 +251,7 @@ regarding the user.</p>
<tr>
<td>10</td>
<td>sharedCount</td>
- <td><code>i32</code></td>
+ <td><code>i64</code></td>
<td></td>
<td>optional</td>
<td><code>0</code></td>
http://git-wip-us.apache.org/repos/asf/airavata/blob/bfc3a84c/modules/sharing-registry/thrift_models/sharing_models.thrift
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/thrift_models/sharing_models.thrift b/modules/sharing-registry/thrift_models/sharing_models.thrift
index 50518e1..25c6ea9 100644
--- a/modules/sharing-registry/thrift_models/sharing_models.thrift
+++ b/modules/sharing-registry/thrift_models/sharing_models.thrift
@@ -224,7 +224,7 @@ struct Entity {
7: optional string description,
8: optional binary binaryData,
9: optional string fullText,
- 10: optional i32 sharedCount = 0,
+ 10: optional i64 sharedCount = 0,
11: optional i64 originalEntityCreationTime,
12: optional i64 createdTime,
13: optional i64 updatedTime
[27/50] airavata git commit: AIRAVATA-2335 Settings portal storage
resource
Posted by sm...@apache.org.
AIRAVATA-2335 Settings portal storage resource
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/8ac8e9ec
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/8ac8e9ec
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/8ac8e9ec
Branch: refs/heads/master
Commit: 8ac8e9ecdb4078314b4c866d9ab98413a85d94ec
Parents: 7126b1f
Author: Marcus Christie <ma...@apache.org>
Authored: Mon Mar 20 17:06:01 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Mon Mar 20 17:06:01 2017 -0400
----------------------------------------------------------------------
.../ansible/inventories/testing-0.17/group_vars/pga/vars.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/8ac8e9ec/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 31683b0..1318ef5 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
@@ -21,8 +21,7 @@ airavata_port: "8930"
gateway_id: "seagrid"
# 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.11_b5f26430-14d5-4372-8a7e-39b125aa640b"
## Portal related variables
super_admin_portal: "false"
[50/50] airavata git commit: merging master
Posted by sm...@apache.org.
merging master
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5100c07d
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5100c07d
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5100c07d
Branch: refs/heads/master
Commit: 5100c07dbb4a40fd87337d3dc68380f851efe2b3
Parents: de5692c 9526e99
Author: Suresh Marru <sm...@apache.org>
Authored: Mon Apr 3 05:50:05 2017 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Mon Apr 3 05:50:05 2017 -0400
----------------------------------------------------------------------
.../apache/airavata/gfac/monitor/email/parser/LSFEmailParser.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
[13/50] airavata git commit: merging remote
Posted by sm...@apache.org.
merging remote
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ae139ff2
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ae139ff2
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ae139ff2
Branch: refs/heads/master
Commit: ae139ff29ef1d7757e046bba10f69153a8889544
Parents: 7beb6a4 fc720d4
Author: scnakandala <su...@gmail.com>
Authored: Thu Mar 16 14:49:47 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Thu Mar 16 14:49:47 2017 -0400
----------------------------------------------------------------------
dev-tools/ansible/hosts | 35 ------------------------
dev-tools/ansible/inventories/develop/hosts | 35 ++++++++++++++++++++++++
2 files changed, 35 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
[39/50] airavata git commit: AIRAVATA-2339 Attempting to fix data
staging with individual account
Posted by sm...@apache.org.
AIRAVATA-2339 Attempting to fix data staging with individual account
In ProcessContext I removed use of isUseUserCRPref() in methods related to
getting gateway storage information. Whether the current experiment is submitted
with user's compute resource preferences or not should not affect gateway
storage information. How to specify user's storage preferences is not yet
implemented and must be implemented with something other than isUseUserCRPref().
In SCPDataStageTask, I changed the construction of the sshSession for the SCP
connection to the compute resource to use
getComputerResourceSSHKeyAuthentication() instead of
getStorageSSHKeyAuthentication(), which would not be correct, if I understand
the code correctly.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/41cc9205
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/41cc9205
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/41cc9205
Branch: refs/heads/master
Commit: 41cc92057c603fb21fc3f1c719d525fbbc7ab281
Parents: 44abf36
Author: Marcus Christie <ma...@apache.org>
Authored: Sat Mar 25 20:29:32 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Sat Mar 25 20:29:48 2017 -0400
----------------------------------------------------------------------
.../gfac/core/context/ProcessContext.java | 39 +++-----------------
.../gfac/impl/task/SCPDataStageTask.java | 2 +-
2 files changed, 7 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/41cc9205/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
index 153f0ee..5dd06db 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
@@ -464,19 +464,10 @@ public class ProcessContext {
}
public String getStorageResourceCredentialToken(){
- if (isUseUserCRPref()) {
- if (userStoragePreference != null &&
- isValid(userStoragePreference.getResourceSpecificCredentialStoreToken())) {
- return userStoragePreference.getResourceSpecificCredentialStoreToken();
- } else {
- return userResourceProfile.getCredentialStoreToken();
- }
+ if (isValid(gatewayStorageResourcePreference.getResourceSpecificCredentialStoreToken())) {
+ return gatewayStorageResourcePreference.getResourceSpecificCredentialStoreToken();
} else {
- if (isValid(gatewayStorageResourcePreference.getResourceSpecificCredentialStoreToken())) {
- return gatewayStorageResourcePreference.getResourceSpecificCredentialStoreToken();
- } else {
- return gatewayResourceProfile.getCredentialStoreToken();
- }
+ return gatewayResourceProfile.getCredentialStoreToken();
}
}
@@ -616,33 +607,15 @@ public class ProcessContext {
}
public String getStorageResourceLoginUserName(){
- if (isUseUserCRPref() &&
- userStoragePreference != null &&
- isValid(userStoragePreference.getLoginUserName())) {
- return userStoragePreference.getLoginUserName();
- } else {
- return gatewayStorageResourcePreference.getLoginUserName();
- }
+ return gatewayStorageResourcePreference.getLoginUserName();
}
public String getStorageFileSystemRootLocation(){
- if (isUseUserCRPref() &&
- userStoragePreference != null &&
- isValid(userStoragePreference.getFileSystemRootLocation())) {
- return userStoragePreference.getFileSystemRootLocation();
- } else {
- return gatewayStorageResourcePreference.getFileSystemRootLocation();
- }
+ return gatewayStorageResourcePreference.getFileSystemRootLocation();
}
public String getStorageResourceId() {
- if (isUseUserCRPref() &&
- userStoragePreference != null &&
- isValid(userStoragePreference.getStorageResourceId())) {
- return userStoragePreference.getStorageResourceId();
- } else {
- return gatewayStorageResourcePreference.getStorageResourceId();
- }
+ return gatewayStorageResourcePreference.getStorageResourceId();
}
private ComputationalResourceSchedulingModel getProcessCRSchedule() {
http://git-wip-us.apache.org/repos/asf/airavata/blob/41cc9205/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
index c4577ba..868a77a 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
@@ -150,7 +150,7 @@ public class SCPDataStageTask implements Task {
return status;
}
- authenticationInfo = Factory.getStorageSSHKeyAuthentication(processContext);
+ authenticationInfo = Factory.getComputerResourceSSHKeyAuthentication(processContext);
status = new TaskStatus(TaskState.COMPLETED);
ServerInfo serverInfo = processContext.getComputeResourceServerInfo();
[24/50] airavata git commit: AIRAVATA-2335 DB password
Posted by sm...@apache.org.
AIRAVATA-2335 DB password
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/3d308ab2
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/3d308ab2
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/3d308ab2
Branch: refs/heads/master
Commit: 3d308ab23a2218e0328cc35a34f53f25b02d21f0
Parents: 28b488d
Author: Marcus Christie <ma...@apache.org>
Authored: Mon Mar 20 09:47:52 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Mon Mar 20 09:47:52 2017 -0400
----------------------------------------------------------------------
.../ansible/inventories/testing-0.17/group_vars/all/vault.yml | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/3d308ab2/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
new file mode 100644
index 0000000..a1d18b5
--- /dev/null
+++ b/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vault.yml
@@ -0,0 +1,7 @@
+$ANSIBLE_VAULT;1.1;AES256
+36666132643537623138323138316561383434336231643237303337623462313834323462656434
+6362663032643235363133613463616663643731316438340a636336316333386434303635303961
+64626364363465366538666538643037366431326533366562393765313631363434323230666665
+3230633265386131360a316232386666613664383561663231346466353065393435376537653631
+36663363353964336464653964393931346530343139313465303730316562613937636566623038
+3637393433373136343934313266653665346665323765373261
[02/50] airavata git commit: AIRAVATA-2335 Allow localhost db
connections
Posted by sm...@apache.org.
AIRAVATA-2335 Allow localhost db connections
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/60a32238
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/60a32238
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/60a32238
Branch: refs/heads/master
Commit: 60a3223898e1afafb2332cb401e7a0da1de1e6bc
Parents: 4b54ff6
Author: Marcus Christie <ma...@apache.org>
Authored: Tue Mar 7 16:17:10 2017 -0500
Committer: Marcus Christie <ma...@apache.org>
Committed: Wed Mar 8 10:15:15 2017 -0500
----------------------------------------------------------------------
dev-tools/ansible/roles/database/tasks/main.yml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/60a32238/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 91e52c2..e2f34c1 100644
--- a/dev-tools/ansible/roles/database/tasks/main.yml
+++ b/dev-tools/ansible/roles/database/tasks/main.yml
@@ -56,6 +56,7 @@
- "{{ groups['api-orch'] }}"
- "{{ groups['gfac'] }}"
- "{{ groups['registry'] }}"
+ - "localhost"
- name: create new user {{ db_user }} with all privilege
mysql_user: name="{{ db_user }}"