Author: chathuri
Date: Mon Jun 3 15:41:41 2013
New Revision: 1489033
URL: http://svn.apache.org/r1489033
Log:
renaming completed_time to status_update_time in GFacJobData table
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/GFac_Job_Data.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GFacJobDataResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-derby.sql
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-mysql.sql
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/data-derby.sql
airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/data-derby.sql
airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.8/migrate_derby.sql
airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.8/migrate_mysql.sql
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/GFac_Job_Data.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/GFac_Job_Data.java?rev=1489033&r1=1489032&r2=1489033&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/GFac_Job_Data.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/GFac_Job_Data.java
Mon Jun 3 15:41:41 2013
@@ -37,7 +37,7 @@ public class GFac_Job_Data {
@Id
private String local_Job_ID;
private Timestamp submitted_time;
- private Timestamp completed_time;
+ private Timestamp status_update_time;
private String status;
@Lob
private String metadata;
@@ -86,8 +86,8 @@ public class GFac_Job_Data {
return submitted_time;
}
- public Timestamp getCompleted_time() {
- return completed_time;
+ public Timestamp getStatus_update_time() {
+ return status_update_time;
}
public String getStatus() {
@@ -142,8 +142,8 @@ public class GFac_Job_Data {
this.submitted_time = submitted_time;
}
- public void setCompleted_time(Timestamp completed_time) {
- this.completed_time = completed_time;
+ public void setStatus_update_time(Timestamp status_update_time) {
+ this.status_update_time = status_update_time;
}
public void setStatus(String status) {
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GFacJobDataResource.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GFacJobDataResource.java?rev=1489033&r1=1489032&r2=1489033&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GFacJobDataResource.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GFacJobDataResource.java
Mon Jun 3 15:41:41 2013
@@ -28,7 +28,6 @@ import org.apache.airavata.persistance.r
import org.apache.airavata.persistance.registry.jpa.model.Workflow_Data;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import sun.security.timestamp.TimestampToken;
import javax.persistence.EntityManager;
import java.sql.Timestamp;
@@ -45,7 +44,7 @@ public class GFacJobDataResource extends
private String jobData;
private String localJobID;
private Timestamp submittedTime;
- private Timestamp completedTime;
+ private Timestamp statusUpdateTime;
private String status;
private String metadata;
@@ -85,8 +84,8 @@ public class GFacJobDataResource extends
return submittedTime;
}
- public Timestamp getCompletedTime() {
- return completedTime;
+ public Timestamp getStatusUpdateTime() {
+ return statusUpdateTime;
}
public String getStatus() {
@@ -133,8 +132,8 @@ public class GFacJobDataResource extends
this.submittedTime = submittedTime;
}
- public void setCompletedTime(Timestamp completedTime) {
- this.completedTime = completedTime;
+ public void setStatusUpdateTime(Timestamp statusUpdateTime) {
+ this.statusUpdateTime = statusUpdateTime;
}
public void setStatus(String status) {
@@ -191,7 +190,7 @@ public class GFacJobDataResource extends
gFacJobData.setHost_descriptor_ID(hostDescID);
gFacJobData.setJob_data(jobData);
gFacJobData.setSubmitted_time(submittedTime);
- gFacJobData.setCompleted_time(completedTime);
+ gFacJobData.setStatus_update_time(statusUpdateTime);
gFacJobData.setStatus(status);
gFacJobData.setMetadata(metadata);
if(existingGfacJobData != null){
@@ -208,7 +207,7 @@ public class GFacJobDataResource extends
existingGfacJobData.setHost_descriptor_ID(hostDescID);
existingGfacJobData.setJob_data(jobData);
existingGfacJobData.setSubmitted_time(submittedTime);
- existingGfacJobData.setCompleted_time(completedTime);
+ existingGfacJobData.setStatus_update_time(statusUpdateTime);
existingGfacJobData.setStatus(status);
existingGfacJobData.setMetadata(metadata);
gFacJobData = em.merge(existingGfacJobData);
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java?rev=1489033&r1=1489032&r2=1489033&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
Mon Jun 3 15:41:41 2013
@@ -622,7 +622,7 @@ public class Utils {
gFacJobDataResource.setJobData(o.getJob_data());
gFacJobDataResource.setLocalJobID(o.getLocal_Job_ID());
gFacJobDataResource.setSubmittedTime(o.getSubmitted_time());
- gFacJobDataResource.setCompletedTime(o.getCompleted_time());
+ gFacJobDataResource.setStatusUpdateTime(o.getStatus_update_time());
gFacJobDataResource.setStatus(o.getStatus());
gFacJobDataResource.setMetadata(o.getMetadata());
return gFacJobDataResource;
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-derby.sql
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-derby.sql?rev=1489033&r1=1489032&r2=1489033&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-derby.sql
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-derby.sql
Mon Jun 3 15:41:41 2013
@@ -207,7 +207,7 @@ create table GFac_Job_Data
job_data CLOB,
local_Job_ID varchar(255),
submitted_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- completed_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
+ status_update_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
status varchar(255),
metadata CLOB,
PRIMARY KEY(local_Job_ID),
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-mysql.sql
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-mysql.sql?rev=1489033&r1=1489032&r2=1489033&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-mysql.sql
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-mysql.sql
Mon Jun 3 15:41:41 2013
@@ -204,7 +204,7 @@ create table GFac_Job_Data
job_data LONGTEXT,
local_Job_ID varchar(255),
submitted_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- completed_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
+ status_update_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
status varchar(255),
metadata LONGTEXT,
PRIMARY KEY(local_Job_ID),
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/data-derby.sql
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/data-derby.sql?rev=1489033&r1=1489032&r2=1489033&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/data-derby.sql
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/data-derby.sql
Mon Jun 3 15:41:41 2013
@@ -206,7 +206,7 @@ create table GFac_Job_Data
job_data CLOB,
local_Job_ID varchar(255),
submitted_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- completed_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
+ status_update_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
status varchar(255),
metadata CLOB,
PRIMARY KEY(local_Job_ID),
Modified:
airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/data-derby.sql
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/data-derby.sql?rev=1489033&r1=1489032&r2=1489033&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/data-derby.sql
(original)
+++
airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/data-derby.sql
Mon Jun 3 15:41:41 2013
@@ -206,7 +206,7 @@ create table GFac_Job_Data
job_data CLOB,
local_Job_ID varchar(255),
submitted_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- completed_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
+ status_update_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
status varchar(255),
metadata CLOB,
PRIMARY KEY(local_Job_ID),
Modified:
airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.8/migrate_derby.sql
URL:
http://svn.apache.org/viewvc/airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.8/migrate_derby.sql?rev=1489033&r1=1489032&r2=1489033&view=diff
==============================================================================
---
airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.8/migrate_derby.sql
(original)
+++
airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.8/migrate_derby.sql
Mon Jun 3 15:41:41 2013
@@ -51,7 +51,7 @@ create table GFac_Job_Data
job_data CLOB,
local_Job_ID varchar(255),
submitted_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- completed_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
+ status_update_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
status INT,
metadata CLOB,
PRIMARY KEY(local_Job_ID),
@@ -60,5 +60,5 @@ create table GFac_Job_Data
);
INSERT INTO GFac_Job_Data(experiment_ID, workflow_instanceID, node_id,
application_descriptor_ID, host_descriptor_ID, service_descriptor_ID,
-job_data, local_Job_ID, submitted_time, completed_time, status, metadata)
SELECT null, workflow_instanceID, node_id, null, invoked_host,
+job_data, local_Job_ID, submitted_time, statusUpdateTime, status, metadata)
SELECT null, workflow_instanceID, node_id, null, invoked_host,
null, null, local_Job_ID, null, null, null, null FROM Gram_Data;
\ No newline at end of file
Modified:
airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.8/migrate_mysql.sql
URL:
http://svn.apache.org/viewvc/airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.8/migrate_mysql.sql?rev=1489033&r1=1489032&r2=1489033&view=diff
==============================================================================
---
airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.8/migrate_mysql.sql
(original)
+++
airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.8/migrate_mysql.sql
Mon Jun 3 15:41:41 2013
@@ -51,7 +51,7 @@ create table GFac_Job_Data
job_data LONGTEXT,
local_Job_ID varchar(255),
submitted_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- completed_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
+ status_update_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
status INT,
metadata LONGTEXT,
PRIMARY KEY(local_Job_ID),
@@ -60,5 +60,5 @@ create table GFac_Job_Data
);
INSERT INTO GFac_Job_Data(experiment_ID, workflow_instanceID, node_id,
application_descriptor_ID, host_descriptor_ID, service_descriptor_ID,
-job_data, local_Job_ID, submitted_time, completed_time, status, metadata)
SELECT null, workflow_instanceID, node_id, null, invoked_host,
+job_data, local_Job_ID, submitted_time, status_update_time, status, metadata)
SELECT null, workflow_instanceID, node_id, null, invoked_host,
null, null, local_Job_ID, null, null, null, null FROM Gram_Data;
\ No newline at end of file
