You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2015/12/04 22:02:04 UTC
[39/54] [abbrv] airavata git commit: credential store related changes,
BES changes
http://git-wip-us.apache.org/repos/asf/airavata/blob/0d9a6126/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 a590b08..d48436a 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
@@ -274,6 +274,9 @@ public class ExperimentRegistry {
processResource.setGatewayExecutionId(process.getGatewayExecutionId());
processResource.setComputeResourceId(process.getComputeResourceId());
processResource.setApplicationInterfaceId(process.getApplicationInterfaceId());
+ processResource.setStorageResourceId(process.getStorageResourceId());
+ processResource.setUserDn(process.getUserDn());
+ processResource.setGenerateCert(process.isGenerateCert());
if(process.isEnableEmailNotification()){
processResource.setEnableEmailNotification(true);
if(process.getEmailAddresses() != null){
@@ -722,6 +725,9 @@ public class ExperimentRegistry {
processResource.setGatewayExecutionId(process.getGatewayExecutionId());
processResource.setComputeResourceId(process.getComputeResourceId());
processResource.setApplicationDeploymentId(process.getApplicationDeploymentId());
+ processResource.setStorageResourceId(process.getStorageResourceId());
+ processResource.setUserDn(process.getUserDn());
+ processResource.setGenerateCert(process.isGenerateCert());
if(process.isEnableEmailNotification()){
processResource.setEnableEmailNotification(true);
if(process.getEmailAddresses() != null){
http://git-wip-us.apache.org/repos/asf/airavata/blob/0d9a6126/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Process.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Process.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Process.java
index 1e8bc98..d6a83b4 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Process.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Process.java
@@ -51,6 +51,8 @@ public class Process {
private ProcessResourceSchedule processResourceSchedule;
private Collection<ProcessStatus> processStatuses;
private Collection<Task> tasks;
+ private String userDn;
+ private boolean generateCert;
@Id
@Column(name = "PROCESS_ID")
@@ -173,6 +175,24 @@ public class Process {
this.emailAddresses = emailAddresses;
}
+ @Column(name = "USER_DN")
+ public String getUserDn() {
+ return userDn;
+ }
+
+ public void setUserDn(String userDn) {
+ this.userDn = userDn;
+ }
+
+ @Column(name = "GENERATE_CERT")
+ public boolean getGenerateCert() {
+ return generateCert;
+ }
+
+ public void setGenerateCert(boolean generateCert) {
+ this.generateCert = generateCert;
+ }
+
// @Override
// public boolean equals(Object o) {
// if (this == o) return true;
http://git-wip-us.apache.org/repos/asf/airavata/blob/0d9a6126/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessResource.java
index 611be62..7d75279 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessResource.java
@@ -52,6 +52,8 @@ public class ProcessResource extends AbstractExpCatResource {
private boolean enableEmailNotification;
private String emailAddresses;
private String storageResourceId;
+ private String userDn;
+ private boolean generateCert;
public String getProcessId() {
return processId;
@@ -157,6 +159,22 @@ public class ProcessResource extends AbstractExpCatResource {
this.storageResourceId = storageResourceId;
}
+ public String getUserDn() {
+ return userDn;
+ }
+
+ public void setUserDn(String userDn) {
+ this.userDn = userDn;
+ }
+
+ public boolean isGenerateCert() {
+ return generateCert;
+ }
+
+ public void setGenerateCert(boolean generateCert) {
+ this.generateCert = generateCert;
+ }
+
public ExperimentCatResource create(ResourceType type) throws RegistryException{
switch (type){
case PROCESS_ERROR:
@@ -559,6 +577,8 @@ public class ProcessResource extends AbstractExpCatResource {
process.setEnableEmailNotification(enableEmailNotification);
process.setEmailAddresses(emailAddresses);
process.setStorageId(storageResourceId);
+ process.setUserDn(userDn);
+ process.setGenerateCert(generateCert);
if (existingProcess == null){
em.persist(process);
}else {
http://git-wip-us.apache.org/repos/asf/airavata/blob/0d9a6126/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
index bcaa071..e38846d 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
@@ -533,6 +533,8 @@ public class Utils {
processResource.setEnableEmailNotification(o.getEnableEmailNotification());
processResource.setEmailAddresses(o.getEmailAddresses());
processResource.setStorageResourceId(o.getStorageId());
+ processResource.setUserDn(o.getUserDn());
+ processResource.setGenerateCert(o.getGenerateCert());
}
return processResource;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/0d9a6126/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
index 41f92c0..ec80798 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
@@ -372,6 +372,8 @@ public class ThriftDataModelConversion {
}
processModel.setTasks(getTaskModelList(processResource.getTaskList()));
processModel.setStorageResourceId(processResource.getStorageResourceId());
+ processModel.setUserDn(processResource.getUserDn());
+ processModel.setGenerateCert(processResource.isGenerateCert());
return processModel;
}
return null;
http://git-wip-us.apache.org/repos/asf/airavata/blob/0d9a6126/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql b/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql
index 1f69088..67e20fc 100644
--- a/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql
+++ b/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql
@@ -191,6 +191,8 @@ CREATE TABLE PROCESS (
ENABLE_EMAIL_NOTIFICATION SMALLINT,
EMAIL_ADDRESSES CLOB,
STORAGE_RESOURCE_ID varchar(255),
+ USER_DN varchar(255),
+ GENERATE_CERT SMALLINT,
PRIMARY KEY (PROCESS_ID),
FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
);
http://git-wip-us.apache.org/repos/asf/airavata/blob/0d9a6126/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql b/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
index f14f0b3..b71b9b1 100644
--- a/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
+++ b/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
@@ -193,6 +193,8 @@ CREATE TABLE PROCESS (
ENABLE_EMAIL_NOTIFICATION BOOLEAN,
EMAIL_ADDRESSES TEXT,
STORAGE_RESOURCE_ID varchar(255),
+ USER_DN varchar(255),
+ GENERATE_CERT SMALLINT,
PRIMARY KEY (PROCESS_ID),
FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
);
http://git-wip-us.apache.org/repos/asf/airavata/blob/0d9a6126/thrift-interface-descriptions/airavata-api/process_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/airavata-api/process_model.thrift b/thrift-interface-descriptions/airavata-api/process_model.thrift
index 409196a..0656e5b 100644
--- a/thrift-interface-descriptions/airavata-api/process_model.thrift
+++ b/thrift-interface-descriptions/airavata-api/process_model.thrift
@@ -58,5 +58,7 @@ struct ProcessModel {
16: optional string gatewayExecutionId,
17: optional bool enableEmailNotification,
18: optional list<string> emailAddresses,
- 19: optional string storageResourceId
+ 19: optional string storageResourceId,
+ 20: optional string userDn,
+ 21: optional bool generateCert = 0
}
\ No newline at end of file