This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/develop by this push:
new bc0f99f AIRAVATA-2978 Add missing columns to
ProcessResourceScheduleEntity
bc0f99f is described below
commit bc0f99f6511438c68b1dfe72c1d401737d718744
Author: Marcus Christie <[email protected]>
AuthorDate: Wed Feb 6 14:35:54 2019 -0500
AIRAVATA-2978 Add missing columns to ProcessResourceScheduleEntity
---
.../expcatalog/ProcessResourceScheduleEntity.java | 46 +++++++++++++++++++++-
.../src/main/resources/expcatalog-derby.sql | 3 ++
.../src/main/resources/expcatalog-mysql.sql | 4 ++
3 files changed, 52 insertions(+), 1 deletion(-)
diff --git
a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessResourceScheduleEntity.java
b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessResourceScheduleEntity.java
index d91d974..a11b221 100644
---
a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessResourceScheduleEntity.java
+++
b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessResourceScheduleEntity.java
@@ -56,6 +56,18 @@ public class ProcessResourceScheduleEntity implements
Serializable {
@Column(name = "TOTAL_PHYSICAL_MEMORY")
private int totalPhysicalMemory;
+ @Column(name = "STATIC_WORKING_DIR")
+ private String staticWorkingDir;
+
+ @Column(name = "OVERRIDE_LOGIN_USER_NAME")
+ private String overrideLoginUserName;
+
+ @Column(name = "OVERRIDE_SCRATCH_LOCATION")
+ private String overrideScratchLocation;
+
+ @Column(name = "OVERRIDE_ALLOCATION_PROJECT_NUMBER")
+ private String overrideAllocationProjectNumber;
+
@OneToOne(targetEntity = ProcessEntity.class, cascade = CascadeType.ALL)
@PrimaryKeyJoinColumn(name = "PROCESS_ID", referencedColumnName =
"PROCESS_ID")
private ProcessEntity process;
@@ -127,6 +139,38 @@ public class ProcessResourceScheduleEntity implements
Serializable {
this.totalPhysicalMemory = totalPhysicalMemory;
}
+ public String getStaticWorkingDir() {
+ return staticWorkingDir;
+ }
+
+ public void setStaticWorkingDir(String staticWorkingDir) {
+ this.staticWorkingDir = staticWorkingDir;
+ }
+
+ public String getOverrideAllocationProjectNumber() {
+ return overrideAllocationProjectNumber;
+ }
+
+ public void setOverrideAllocationProjectNumber(String
overrideAllocationProjectNumber) {
+ this.overrideAllocationProjectNumber = overrideAllocationProjectNumber;
+ }
+
+ public String getOverrideLoginUserName() {
+ return overrideLoginUserName;
+ }
+
+ public void setOverrideLoginUserName(String overrideLoginUserName) {
+ this.overrideLoginUserName = overrideLoginUserName;
+ }
+
+ public String getOverrideScratchLocation() {
+ return overrideScratchLocation;
+ }
+
+ public void setOverrideScratchLocation(String overrideScratchLocation) {
+ this.overrideScratchLocation = overrideScratchLocation;
+ }
+
public ProcessEntity getProcess() {
return process;
}
@@ -134,4 +178,4 @@ public class ProcessResourceScheduleEntity implements
Serializable {
public void setProcess(ProcessEntity process) {
this.process = process;
}
-}
\ No newline at end of file
+}
diff --git
a/modules/registry-refactoring/src/main/resources/expcatalog-derby.sql
b/modules/registry-refactoring/src/main/resources/expcatalog-derby.sql
index ebb4a58..b791d80 100644
--- a/modules/registry-refactoring/src/main/resources/expcatalog-derby.sql
+++ b/modules/registry-refactoring/src/main/resources/expcatalog-derby.sql
@@ -313,6 +313,9 @@ CREATE TABLE PROCESS_RESOURCE_SCHEDULE (
WALL_TIME_LIMIT INT,
TOTAL_PHYSICAL_MEMORY INT,
STATIC_WORKING_DIR varchar(255),
+ OVERRIDE_ALLOCATION_PROJECT_NUMBER varchar(255),
+ OVERRIDE_LOGIN_USER_NAME varchar(255),
+ OVERRIDE_SCRATCH_LOCATION varchar(255),
PRIMARY KEY (PROCESS_ID),
FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE
CASCADE
);
diff --git
a/modules/registry-refactoring/src/main/resources/expcatalog-mysql.sql
b/modules/registry-refactoring/src/main/resources/expcatalog-mysql.sql
index 068daeb..447b558 100644
--- a/modules/registry-refactoring/src/main/resources/expcatalog-mysql.sql
+++ b/modules/registry-refactoring/src/main/resources/expcatalog-mysql.sql
@@ -314,6 +314,10 @@ CREATE TABLE PROCESS_RESOURCE_SCHEDULE (
QUEUE_NAME varchar(255),
WALL_TIME_LIMIT int(11),
TOTAL_PHYSICAL_MEMORY int(11),
+ STATIC_WORKING_DIR varchar(255),
+ OVERRIDE_ALLOCATION_PROJECT_NUMBER varchar(255),
+ OVERRIDE_LOGIN_USER_NAME varchar(255),
+ OVERRIDE_SCRATCH_LOCATION varchar(255),
PRIMARY KEY (PROCESS_ID),
FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE
CASCADE
)ENGINE=InnoDB DEFAULT CHARSET=latin1;
