date:20161012

[3/3] airavata git commit: Approved and merge pull request 52 into develop branch

2016-10-12 Thread shameera

Approved and merge pull request 52 into develop branch


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

Branch: refs/heads/develop
Commit: 6250ff1dcd72f54bca5333d3c71729b12578f740
Parents: 7c6c562 1b91dd1
Author: Shameera Rathnayaka 
Authored: Wed Oct 12 15:37:33 2016 -0400
Committer: Shameera Rathnayaka 
Committed: Wed Oct 12 15:37:33 2016 -0400

--
 .../airavata/compute_resource_model_types.cpp   |  28 ++--
 .../lib/airavata/compute_resource_model_types.h |  13 +-
 .../Model/AppCatalog/ComputeResource/Types.php  |   2 +
 .../model/appcatalog/computeresource/ttypes.py  |   5 +
 .../computeresource/LOCALSubmission.java|  53 +++
 .../appcatalog/computeresource/MonitorMode.java |   5 +-
 .../server/src/main/resources/gfac-config.yaml  |   4 +-
 .../airavata/gfac/impl/GFacEngineImpl.java  |  11 +-
 .../apache/airavata/gfac/impl/HTTPUtils.java|   7 +
 .../airavata/gfac/impl/LocalRemoteCluster.java  |  42 +-
 .../gfac/impl/task/LocalJobSubmissionTask.java  | 150 ++-
 .../airavata/gfac/impl/task/TaskUtils.java  |   2 +-
 .../cpi/impl/SimpleOrchestratorImpl.java|  12 +-
 .../app/catalog/impl/ComputeResourceImpl.java   |   1 +
 .../core/app/catalog/model/LocalSubmission.java |  11 ++
 .../resources/LocalSubmissionResource.java  |  12 +-
 .../app/catalog/util/AppCatalogJPAUtils.java|   1 +
 .../util/AppCatalogThriftConversion.java|   1 +
 .../src/main/resources/appcatalog-derby.sql |   1 +
 .../src/main/resources/appcatalog-mysql.sql |   1 +
 .../compute_resource_model.thrift   |   5 +-
 21 files changed, 228 insertions(+), 139 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/6250ff1d/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java
--

http://git-wip-us.apache.org/repos/asf/airavata/blob/6250ff1d/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
--

http://git-wip-us.apache.org/repos/asf/airavata/blob/6250ff1d/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
--

[2/3] airavata git commit: Code cleanup

2016-10-12 Thread shameera

Code cleanup


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

Branch: refs/heads/develop
Commit: 1b91dd1ce35f2ed37ad93b9762fe227aa72ae913
Parents: 8f91bde
Author: Ajinkya Dhamnaskar 
Authored: Wed Oct 12 13:47:00 2016 -0400
Committer: Ajinkya Dhamnaskar 
Committed: Wed Oct 12 13:47:00 2016 -0400

--
 .../main/java/org/apache/airavata/gfac/impl/HTTPUtils.java| 7 +++
 .../orchestrator/cpi/impl/SimpleOrchestratorImpl.java | 6 ++
 2 files changed, 9 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/1b91dd1c/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HTTPUtils.java
--
diff --git 
a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HTTPUtils.java
 
b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HTTPUtils.java
new file mode 100644
index 000..cbf5adc
--- /dev/null
+++ 
b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HTTPUtils.java
@@ -0,0 +1,7 @@
+package org.apache.airavata.gfac.impl;
+
+/**
+ * Created by Ajinkya on 10/10/16.
+ */
+public class HTTPUtils {
+}

http://git-wip-us.apache.org/repos/asf/airavata/blob/1b91dd1c/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
--
diff --git 
a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
 
b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
index b14b5cd..dec9b2c 100644
--- 
a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
+++ 
b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
@@ -406,15 +406,13 @@ public class SimpleOrchestratorImpl extends 
AbstractOrchestrator{
 DataType type = processOutput.getType();
 switch (type) {
 case STDOUT :
-if(null == processOutput.getValue() ||
-(null != processOutput.getValue() && 
processOutput.getValue().trim().isEmpty())){
+if(null == processOutput.getValue() || 
processOutput.getValue().trim().isEmpty()){
 processOutput.setValue(appName + ".stdout");
 }
 createOutputDataSatagingTasks(processModel, gatewayId, 
dataStagingTaskIds, processOutput);
 break;
 case STDERR:
-if(null == processOutput.getValue() ||
-(null != processOutput.getValue() && 
processOutput.getValue().trim().isEmpty())){
+if(null == processOutput.getValue() || 
processOutput.getValue().trim().isEmpty()){
 processOutput.setValue(appName + ".stderr");
 }
 createOutputDataSatagingTasks(processModel, gatewayId, 
dataStagingTaskIds, processOutput);

[1/3] airavata git commit: adding search criteria as a new struct

2016-10-12 Thread scnakandala

Repository: airavata
Updated Branches:
  refs/heads/develop 6250ff1dc -> bff76559e


http://git-wip-us.apache.org/repos/asf/airavata/blob/bff76559/modules/sharing-registry/thrift_models/sharing_cpi.thrift
--
diff --git a/modules/sharing-registry/thrift_models/sharing_cpi.thrift 
b/modules/sharing-registry/thrift_models/sharing_cpi.thrift
index 3b26a27..02a7768 100644
--- a/modules/sharing-registry/thrift_models/sharing_cpi.thrift
+++ b/modules/sharing-registry/thrift_models/sharing_cpi.thrift
@@ -73,8 +73,7 @@ service GovRegistryService {
 bool updateEntity(1: required sharing_models.Entity entity) throws (1: 
sharing_models.SharingRegistryException gre)
 bool deleteEntity(1: required string entityId) throws (1: 
sharing_models.SharingRegistryException gre)
 sharing_models.Entity getEntity(1: required string entityId) throws (1: 
sharing_models.SharingRegistryException gre)
-list searchEntities(1: required string userId, 2: 
required string entityTypeId, 3: required map filters, 4: required i32 offset, 5: required i32 limit) throws 
(1: sharing_models.SharingRegistryException gre)
+list searchEntities(1: required string userId, 2: 
required string entityTypeId, 3: required list 
filters, 4: required i32 offset, 5: required i32 limit) throws (1: 
sharing_models.SharingRegistryException gre)
 list getListOfSharedUsers(1: required string 
entityId, 2: required string permissionTypeId) throws (1: 
sharing_models.SharingRegistryException gre)
 list getListOfSharedGroups(1: required string 
entityId, 2: required string permissionTypeId) throws (1: 
sharing_models.SharingRegistryException gre)
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/bff76559/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 8e78143..79bb564 100644
--- a/modules/sharing-registry/thrift_models/sharing_models.thrift
+++ b/modules/sharing-registry/thrift_models/sharing_models.thrift
@@ -78,12 +78,27 @@ struct EntityType {
 6: optional i64 updatedTime
 }
 
-enum EntitySearchFields {
+enum EntitySearchField {
 NAME,
 DESCRIPTION,
-FULL_TEXT
+FULL_TEXT,
+PRRENT_ENTITY_ID,
+CREATED_TIME,
+UPDATED_TIME
 }
 
+enum SearchCondition {
+EQUAL,
+LIKE,
+GTE,
+LTE
+}
+
+struct SearchCriteria {
+1: optional EntitySearchField searchField,
+2: optional string value,
+3: optional SearchCondition searchCondition
+}
 
 struct Entity {
 1: optional string entityId = DO_NOT_SET_AT_CLIENTS_ID,

[3/3] airavata git commit: adding search criteria as a new struct

2016-10-12 Thread scnakandala

adding search criteria as a new struct


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

Branch: refs/heads/develop
Commit: bff76559ecdb0a49250404aab4c57a5e41630d1c
Parents: 6250ff1
Author: scnakandala 
Authored: Wed Oct 12 16:42:40 2016 -0400
Committer: scnakandala 
Committed: Wed Oct 12 16:42:45 2016 -0400

--
 .../server/handler/AiravataServerHandler.java   |6 +-
 modules/sharing-registry/README.md  |2 +-
 .../sharing/registry/AiravataDataMigrator.java  |  166 ++
 .../airavata/sharing/registry/DataMigrator.java |  166 --
 .../db/repositories/EntityRepository.java   |   35 +-
 .../sharing/registry/db/utils/DBConstants.java  |   18 +-
 .../server/SharingRegistryServerHandler.java|2 +-
 .../SharingRegistryServerHandlerTest.java   |9 +-
 .../sharing-registry-stubs/pom.xml  |   14 +
 .../sharing/registry/models/Domain.java |2 +-
 .../sharing/registry/models/Entity.java |2 +-
 .../registry/models/EntitySearchField.java  |   53 +
 .../registry/models/EntitySearchFields.java |   48 -
 .../sharing/registry/models/EntityType.java |2 +-
 .../registry/models/GroupMembership.java|2 +-
 .../sharing/registry/models/PermissionType.java |2 +-
 .../registry/models/SearchCondition.java|   51 +
 .../sharing/registry/models/SearchCriteria.java |  642 +++
 .../sharing/registry/models/Sharing.java|2 +-
 .../models/SharingRegistryException.java|   36 +-
 .../airavata/sharing/registry/models/User.java  |2 +-
 .../sharing/registry/models/UserGroup.java  |2 +-
 .../service/cpi/GovRegistryService.java | 1609 +-
 .../thrift_models/sharing_cpi.thrift|3 +-
 .../thrift_models/sharing_models.thrift |   19 +-
 25 files changed, 1829 insertions(+), 1066 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/bff76559/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 a0a563c..f0c0559 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
@@ -756,7 +756,7 @@ public class AiravataServerHandler implements 
Airavata.Iface {
 // user projects + user accessible projects
 List accessibleProjectIds = new ArrayList<>();
 
sharingRegistryServerHandler.searchEntities(userName+"@"+gatewayId , 
gatewayId+":PROJECT",
-new HashMap<>(), offset, 
limit).stream().forEach(p->accessibleProjectIds.add(p.entityId));
+new ArrayList<>(), offset, 
limit).stream().forEach(p->accessibleProjectIds.add(p.entityId));
 return getRegistryServiceClient().searchProjects(gatewayId, 
userName, accessibleProjectIds, new HashMap<>(), limit, offset);
 }else{
 return getRegistryServiceClient().getUserProjects(gatewayId, 
userName, limit, offset);
@@ -801,7 +801,7 @@ public class AiravataServerHandler implements 
Airavata.Iface {
 
 if(ServerSettings.isEnableSharing())
 
sharingRegistryServerHandler.searchEntities(userName+"@"+gatewayId, 
gatewayId+":PROJECT",
-new HashMap<>(), 0, 
-1).stream().forEach(e->accessibleProjIds.add(e.entityId));
+new ArrayList<>(), 0, 
-1).stream().forEach(e->accessibleProjIds.add(e.entityId));
 
 return getRegistryServiceClient().searchProjects(gatewayId, 
userName, accessibleProjIds, filters, limit, offset);
 }catch (Exception e) {
@@ -838,7 +838,7 @@ public class AiravataServerHandler implements 
Airavata.Iface {
 List accessibleExpIds = new ArrayList<>();
 if(ServerSettings.isEnableSharing())
 
sharingRegistryServerHandler.searchEntities(userName+"@"+gatewayId, 
gatewayId+":EXPERIMENT",
-new HashMap<>(), 0, 
-1).forEach(e->accessibleExpIds.add(e.entityId));
+new ArrayList<>(), 0, 
-1).forEach(e->accessibleExpIds.add(e.entityId));

[2/3] airavata git commit: adding search criteria as a new struct

2016-10-12 Thread scnakandala

http://git-wip-us.apache.org/repos/asf/airavata/blob/bff76559/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/GovRegistryService.java
--
diff --git 
a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/GovRegistryService.java
 
b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/GovRegistryService.java
index e041fd5..c355c7e 100644
--- 
a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/GovRegistryService.java
+++ 
b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/GovRegistryService.java
@@ -6,13 +6,13 @@
  */
 package org.apache.airavata.sharing.registry.service.cpi;
 
-import org.apache.airavata.sharing.registry.models.SharingRegistryException;
 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;
@@ -22,15 +22,19 @@ 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;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-10-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-10-12")
 public class GovRegistryService {
 
   public interface Iface {
@@ -41,15 +45,15 @@ public class GovRegistryService {
  * 
  * @param domain
  */
-public String 
createDomain(org.apache.airavata.sharing.registry.models.Domain domain) throws 
SharingRegistryException, org.apache.thrift.TException;
+public String 
createDomain(org.apache.airavata.sharing.registry.models.Domain domain) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
-public boolean 
updateDomain(org.apache.airavata.sharing.registry.models.Domain domain) throws 
SharingRegistryException, org.apache.thrift.TException;
+public boolean 
updateDomain(org.apache.airavata.sharing.registry.models.Domain domain) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
-public boolean deleteDomain(String domainId) throws 
SharingRegistryException, org.apache.thrift.TException;
+public boolean deleteDomain(String domainId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
-public org.apache.airavata.sharing.registry.models.Domain getDomain(String 
domainId) throws SharingRegistryException, org.apache.thrift.TException;
+public org.apache.airavata.sharing.registry.models.Domain getDomain(String 
domainId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
-public List 
getDomains(int offset, int limit) throws SharingRegistryException, 
org.apache.thrift.TException;
+public List 
getDomains(int offset, int limit) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
 /**
  *  * User Operations
@@ -57,15 +61,15 @@ public class GovRegistryService {
  * 
  * @param user
  */
-public String createUser(org.apache.airavata.sharing.registry.models.User 
user) throws SharingRegistryException, org.apache.thrift.TException;
+public String createUser(org.apache.airavata.sharing.registry.models.User 
user) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
-public boolean 
updatedUser(org.apache.airavata.sharing.registry.models.User user) throws 
SharingRegistryException, org.apache.thrift.TException;
+public boolean 
updatedUser(org.apache.airavata.sharing.registry.models.User user) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
-public boolean deleteUser(String userId) throws SharingRegistryException, 
org.apache.thrift.TException;
+public boolean deleteUser(String userId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
-public

[1/3] airavata git commit: AIRAVATA-2113. Fixing local provider

2016-10-12 Thread shameera

Repository: airavata
Updated Branches:
  refs/heads/develop 7c6c56253 -> 6250ff1dc


AIRAVATA-2113. Fixing local provider


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

Branch: refs/heads/develop
Commit: 8f91bdee95c0b27825fe9f59d72a48dad1168149
Parents: 1f48ce3
Author: Ajinkya Dhamnaskar 
Authored: Tue Oct 4 14:58:44 2016 -0400
Committer: Ajinkya Dhamnaskar 
Committed: Tue Oct 4 14:58:44 2016 -0400

--
 .../airavata/compute_resource_model_types.cpp   |  28 ++--
 .../lib/airavata/compute_resource_model_types.h |  13 +-
 .../Model/AppCatalog/ComputeResource/Types.php  |   2 +
 .../model/appcatalog/computeresource/ttypes.py  |   5 +
 .../computeresource/LOCALSubmission.java|  53 +++
 .../appcatalog/computeresource/MonitorMode.java |   5 +-
 .../server/src/main/resources/gfac-config.yaml  |   4 +-
 .../airavata/gfac/impl/GFacEngineImpl.java  |  11 +-
 .../airavata/gfac/impl/LocalRemoteCluster.java  |  42 +-
 .../gfac/impl/task/LocalJobSubmissionTask.java  | 150 ++-
 .../airavata/gfac/impl/task/TaskUtils.java  |   2 +-
 .../cpi/impl/SimpleOrchestratorImpl.java|  14 +-
 .../app/catalog/impl/ComputeResourceImpl.java   |   1 +
 .../core/app/catalog/model/LocalSubmission.java |  11 ++
 .../resources/LocalSubmissionResource.java  |  12 +-
 .../app/catalog/util/AppCatalogJPAUtils.java|   1 +
 .../util/AppCatalogThriftConversion.java|   1 +
 .../src/main/resources/appcatalog-derby.sql |   1 +
 .../src/main/resources/appcatalog-mysql.sql |   1 +
 .../compute_resource_model.thrift   |   5 +-
 20 files changed, 223 insertions(+), 139 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/8f91bdee/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp
--
diff --git 
a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp
 
b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp
index 650bcac..d1f0f20 100644
--- 
a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp
+++ 
b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp
@@ -106,15 +106,17 @@ int _kMonitorModeValues[] = {
   MonitorMode::POLL_JOB_MANAGER,
   MonitorMode::JOB_EMAIL_NOTIFICATION_MONITOR,
   MonitorMode::XSEDE_AMQP_SUBSCRIBE,
-  MonitorMode::FORK
+  MonitorMode::FORK,
+  MonitorMode::LOCAL
 };
 const char* _kMonitorModeNames[] = {
   "POLL_JOB_MANAGER",
   "JOB_EMAIL_NOTIFICATION_MONITOR",
   "XSEDE_AMQP_SUBSCRIBE",
-  "FORK"
+  "FORK",
+  "LOCAL"
 };
-const std::map 
_MonitorMode_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(4, 
_kMonitorModeValues, _kMonitorModeNames), ::apache::thrift::TEnumIterator(-1, 
NULL, NULL));
+const std::map 
_MonitorMode_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(5, 
_kMonitorModeValues, _kMonitorModeNames), ::apache::thrift::TEnumIterator(-1, 
NULL, NULL));
 
 int _kDMTypeValues[] = {
   DMType::COMPUTE_RESOURCE,
@@ -628,7 +630,6 @@ void LOCALSubmission::__set_resourceJobManager(const 
ResourceJobManager& val) {
 
 void LOCALSubmission::__set_securityProtocol(const  
::apache::airavata::model::data::movement::SecurityProtocol::type val) {
   this->securityProtocol = val;
-__isset.securityProtocol = true;
 }
 
 uint32_t LOCALSubmission::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -645,6 +646,7 @@ uint32_t 
LOCALSubmission::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   bool isset_jobSubmissionInterfaceId = false;
   bool isset_resourceJobManager = false;
+  bool isset_securityProtocol = false;
 
   while (true)
   {
@@ -675,7 +677,7 @@ uint32_t 
LOCALSubmission::read(::apache::thrift::protocol::TProtocol* iprot) {
   int32_t ecast23;
   xfer += iprot->readI32(ecast23);
   this->securityProtocol = ( 
::apache::airavata::model::data::movement::SecurityProtocol::type)ecast23;
-  this->__isset.securityProtocol = true;
+  isset_securityProtocol = true;
 } else {
   xfer += iprot->skip(ftype);
 }
@@ -693,6 +695,8 @@ uint32_t 
LOCALSubmission::read(::apache::thrift::protocol::TProtocol* iprot) {
 throw TProtocolException(TProtocolException::INVALID_DATA);
   if (!isset_resourceJobManager)
 throw

airavata git commit: moving sharing registry initialization to AiravataServerHandler

2016-10-12 Thread scnakandala

Repository: airavata
Updated Branches:
  refs/heads/develop 81d8dee38 -> 7c6c56253


moving sharing registry initialization to AiravataServerHandler


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

Branch: refs/heads/develop
Commit: 7c6c562533efbb5a42ab136b9a7a61a5d8d9b9e5
Parents: 81d8dee
Author: scnakandala 
Authored: Wed Oct 12 11:46:50 2016 -0400
Committer: scnakandala 
Committed: Wed Oct 12 11:46:50 2016 -0400

--
 .../server/handler/AiravataServerHandler.java   | 59 ++--
 .../server/SharingRegistryServerHandler.java| 53 --
 2 files changed, 55 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/7c6c5625/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 1a64ef8..a0a563c 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
@@ -77,10 +77,7 @@ import org.apache.airavata.model.workspace.Project;
 import org.apache.airavata.registry.api.RegistryService;
 import org.apache.airavata.registry.api.client.RegistryServiceClientFactory;
 import org.apache.airavata.registry.api.exception.RegistryServiceException;
-import org.apache.airavata.sharing.registry.models.Domain;
-import org.apache.airavata.sharing.registry.models.Entity;
-import org.apache.airavata.sharing.registry.models.EntityType;
-import org.apache.airavata.sharing.registry.models.PermissionType;
+import org.apache.airavata.sharing.registry.models.*;
 import 
org.apache.airavata.sharing.registry.server.SharingRegistryServerHandler;
 import org.apache.thrift.TException;
 import org.slf4j.Logger;
@@ -102,6 +99,7 @@ public class AiravataServerHandler implements Airavata.Iface 
{
 experimentPublisher = 
MessagingFactory.getPublisher(Type.EXPERIMENT_LAUNCH);
 
 sharingRegistryServerHandler = new SharingRegistryServerHandler();
+initSharingRegistry();
 } catch (ApplicationSettingsException e) {
 logger.error("Error occured while reading airavata-server 
properties..", e);
 } catch (AiravataException e) {
@@ -111,6 +109,59 @@ public class AiravataServerHandler implements 
Airavata.Iface {
 }
 }
 
+private void initSharingRegistry() throws ApplicationSettingsException, 
TException {
+
if(sharingRegistryServerHandler.getDomain(ServerSettings.getDefaultUserGateway())
 == null){
+Domain domain = new Domain();
+domain.setDomainId(ServerSettings.getDefaultUserGateway());
+domain.setName(ServerSettings.getDefaultUserGateway());
+domain.setDescription("Domain entry for " + domain.name);
+sharingRegistryServerHandler.createDomain(domain);
+
+User user = new User();
+user.setDomainId(domain.domainId);
+
user.setUserId(ServerSettings.getDefaultUser()+"@"+ServerSettings.getDefaultUserGateway());
+user.setUserName(ServerSettings.getDefaultUser());
+sharingRegistryServerHandler.createUser(user);
+
+//Creating Entity Types for each domain
+EntityType entityType = new EntityType();
+entityType.setEntityTypeId(domain.domainId+":PROJECT");
+entityType.setDomainId(domain.domainId);
+entityType.setName("PROJECT");
+entityType.setDescription("Project entity type");
+sharingRegistryServerHandler.createEntityType(entityType);
+
+entityType = new EntityType();
+entityType.setEntityTypeId(domain.domainId+":EXPERIMENT");
+entityType.setDomainId(domain.domainId);
+entityType.setName("EXPERIMENT");
+entityType.setDescription("Experiment entity type");
+sharingRegistryServerHandler.createEntityType(entityType);
+
+entityType = new EntityType();
+entityType.setEntityTypeId(domain.domainId+":FILE");
+entityType.setDomainId(domain.domainId);
+entityType.setName("FILE");
+entityType.setDescription("File entity type");
+

[3/3] airavata git commit: Approved and merge pull request 52 into develop branch

[2/3] airavata git commit: Code cleanup

[1/3] airavata git commit: adding search criteria as a new struct

[3/3] airavata git commit: adding search criteria as a new struct

[2/3] airavata git commit: adding search criteria as a new struct

[1/3] airavata git commit: AIRAVATA-2113. Fixing local provider

airavata git commit: moving sharing registry initialization to AiravataServerHandler

7 matches

Site Navigation

Mail list logo

Footer information