You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2012/10/24 21:54:44 UTC
svn commit: r1401847 - in
/airavata/trunk/modules/registry/airavata-jpa-registry/src:
main/java/org/apache/airavata/persistance/registry/jpa/impl/
main/java/org/apache/airavata/persistance/registry/jpa/model/
main/java/org/apache/airavata/persistance/r...
Author: chathuri
Date: Wed Oct 24 19:54:43 2012
New Revision: 1401847
URL: http://svn.apache.org/viewvc?rev=1401847&view=rev
Log:
fixing date does not updating successfully in congfigurations and other tables
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Configuration.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Published_Workflow.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/User_Workflow.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Workflow_Data.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ConfigurationResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/PublishWorkflowResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/UserWorkflowResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ConfigurationResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentMetadataResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GatewayResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ProjectResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/PublishWorkflowResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserWorkflowResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkerResourceTest.java
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java?rev=1401847&r1=1401846&r2=1401847&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java Wed Oct 24 19:54:43 2012
@@ -119,14 +119,14 @@ public class AiravataJPARegistry extends
config = ResourceUtils.createConfiguration(key);
}
config.setConfigVal(value);
- config.setExpireDate(new java.sql.Date(expire.getTime()));
+ config.setExpireDate(new Timestamp(expire.getTime()));
config.save();
}
public void addConfiguration(String key, String value, Date expire) {
ConfigurationResource config = ResourceUtils.createConfiguration(key);
config.setConfigVal(value);
- config.setExpireDate(new java.sql.Date(expire.getTime()));
+ config.setExpireDate(new Timestamp(expire.getTime()));
config.save();
}
@@ -588,7 +588,7 @@ public class AiravataJPARegistry extends
}
ExperimentResource experimentResource = project.createExperiment(experimentId);
if (experiment.getSubmittedDate()!=null) {
- experimentResource.setSubmittedDate(new java.sql.Date(experiment.getSubmittedDate().getTime()));
+ experimentResource.setSubmittedDate(new Timestamp(experiment.getSubmittedDate().getTime()));
}
experimentResource.save();
}
@@ -675,7 +675,7 @@ public class AiravataJPARegistry extends
PublishWorkflowResource publishedWorkflow = gateway.createPublishedWorkflow(publishWorkflowName);
publishedWorkflow.setCreatedUser(getUser().getUserName());
publishedWorkflow.setContent(workflowGraphXML);
- publishedWorkflow.setPublishedDate(new java.sql.Date(Calendar.getInstance().getTime().getTime()));
+ publishedWorkflow.setPublishedDate(new Timestamp(Calendar.getInstance().getTime().getTime()));
publishedWorkflow.save();
}
@@ -1189,7 +1189,7 @@ public class AiravataJPARegistry extends
nodeData.save();
//Each time node status is updated the the time of update for the workflow status is going to be the same
WorkflowInstanceStatus currentWorkflowInstanceStatus = getWorkflowInstanceStatus(workflowInstance.getWorkflowInstanceId());
- updateWorkflowInstanceStatus(new WorkflowInstanceStatus(workflowInstance, currentWorkflowInstanceStatus.getExecutionStatus(),t));
+ updateWorkflowInstanceStatus(new WorkflowInstanceStatus(workflowInstance, currentWorkflowInstanceStatus.getExecutionStatus(), t));
}
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Configuration.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Configuration.java?rev=1401847&r1=1401846&r2=1401847&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Configuration.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Configuration.java Wed Oct 24 19:54:43 2012
@@ -22,7 +22,7 @@ package org.apache.airavata.persistance.
import javax.persistence.*;
import java.io.Serializable;
-import java.sql.Date;
+import java.sql.Timestamp;
@Entity
@IdClass(Configuration_PK.class)
@@ -31,7 +31,7 @@ public class Configuration implements Se
private String config_key;
@Id
private String config_val;
- private Date expire_date;
+ private Timestamp expire_date;
public String getConfig_key() {
return config_key;
@@ -41,7 +41,7 @@ public class Configuration implements Se
return config_val;
}
- public Date getExpire_date() {
+ public Timestamp getExpire_date() {
return expire_date;
}
@@ -53,7 +53,7 @@ public class Configuration implements Se
this.config_val = config_val;
}
- public void setExpire_date(Date expire_date) {
+ public void setExpire_date(Timestamp expire_date) {
this.expire_date = expire_date;
}
}
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment.java?rev=1401847&r1=1401846&r2=1401847&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment.java Wed Oct 24 19:54:43 2012
@@ -22,13 +22,13 @@
package org.apache.airavata.persistance.registry.jpa.model;
import javax.persistence.*;
-import java.sql.Date;
+import java.sql.Timestamp;
@Entity
public class Experiment {
@Id
private String experiment_ID;
- private Date submitted_date;
+ private Timestamp submitted_date;
private String user_name;
private String gateway_name;
private String project_name;
@@ -49,7 +49,7 @@ public class Experiment {
return experiment_ID;
}
- public Date getSubmitted_date() {
+ public Timestamp getSubmitted_date() {
return submitted_date;
}
@@ -65,7 +65,7 @@ public class Experiment {
this.experiment_ID = experiment_ID;
}
- public void setSubmitted_date(Date submitted_date) {
+ public void setSubmitted_date(Timestamp submitted_date) {
this.submitted_date = submitted_date;
}
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Published_Workflow.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Published_Workflow.java?rev=1401847&r1=1401846&r2=1401847&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Published_Workflow.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Published_Workflow.java Wed Oct 24 19:54:43 2012
@@ -21,7 +21,7 @@
package org.apache.airavata.persistance.registry.jpa.model;
import javax.persistence.*;
-import java.sql.Date;
+import java.sql.Timestamp;
@Entity
@IdClass(Published_Workflow_PK.class)
@@ -38,7 +38,7 @@ public class Published_Workflow {
private Gateway gateway;
private String version;
- private Date published_date;
+ private Timestamp published_date;
@Lob
private byte[] workflow_content;
@@ -56,7 +56,7 @@ public class Published_Workflow {
return version;
}
- public Date getPublished_date() {
+ public Timestamp getPublished_date() {
return published_date;
}
@@ -76,7 +76,7 @@ public class Published_Workflow {
this.version = version;
}
- public void setPublished_date(Date published_date) {
+ public void setPublished_date(Timestamp published_date) {
this.published_date = published_date;
}
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/User_Workflow.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/User_Workflow.java?rev=1401847&r1=1401846&r2=1401847&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/User_Workflow.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/User_Workflow.java Wed Oct 24 19:54:43 2012
@@ -21,7 +21,7 @@
package org.apache.airavata.persistance.registry.jpa.model;
import javax.persistence.*;
-import java.sql.Date;
+import java.sql.Timestamp;
@Entity
@IdClass(User_Workflow_PK.class)
@@ -42,7 +42,7 @@ public class User_Workflow {
private Users user;
private String path;
- private Date last_updated_date;
+ private Timestamp last_updated_date;
@Lob
private byte[] workflow_graph;
@@ -87,7 +87,7 @@ public class User_Workflow {
return path;
}
- public Date getLast_updated_date() {
+ public Timestamp getLast_updated_date() {
return last_updated_date;
}
@@ -107,7 +107,7 @@ public class User_Workflow {
this.workflow_graph = workflow_graph;
}
- public void setLast_updated_date(Date last_updated_date) {
+ public void setLast_updated_date(Timestamp last_updated_date) {
this.last_updated_date = last_updated_date;
}
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Workflow_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/Workflow_Data.java?rev=1401847&r1=1401846&r2=1401847&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Workflow_Data.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Workflow_Data.java Wed Oct 24 19:54:43 2012
@@ -31,7 +31,6 @@ public class Workflow_Data {
@JoinColumn(name="experiment_ID")
private Experiment_Data experiment_data;
-// private String experiment_ID;
@Id
private String workflow_instanceID;
private String template_name;
@@ -39,13 +38,6 @@ public class Workflow_Data {
private Timestamp start_time;
private Timestamp last_update_time;
-// public String getExperiment_ID() {
-// return experiment_ID;
-// }
-//
-// public void setExperiment_ID(String experiment_ID) {
-// this.experiment_ID = experiment_ID;
-// }
public String getWorkflow_instanceID() {
return workflow_instanceID;
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ConfigurationResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ConfigurationResource.java?rev=1401847&r1=1401846&r2=1401847&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ConfigurationResource.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ConfigurationResource.java Wed Oct 24 19:54:43 2012
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.persistance.registry.jpa.resources;
-import java.sql.Date;
+import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.locks.Lock;
@@ -41,7 +41,7 @@ public class ConfigurationResource exten
private final static Logger logger = LoggerFactory.getLogger(ConfigurationResource.class);
private String configKey;
private String configVal;
- private Date expireDate;
+ private Timestamp expireDate;
/**
*
@@ -142,7 +142,7 @@ public class ConfigurationResource exten
*
* @param expireDate expire date of the configuration
*/
- public void setExpireDate(Date expireDate) {
+ public void setExpireDate(Timestamp expireDate) {
this.expireDate = expireDate;
}
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentResource.java?rev=1401847&r1=1401846&r2=1401847&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentResource.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentResource.java Wed Oct 24 19:54:43 2012
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.persistance.registry.jpa.resources;
-import java.sql.Date;
+import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.List;
@@ -43,7 +43,7 @@ public class ExperimentResource extends
private static final Logger logger = LoggerFactory.getLogger(ExperimentResource.class);
private WorkerResource worker;
private String expID;
- private Date submittedDate;
+ private Timestamp submittedDate;
private GatewayResource gateway;
private ProjectResource project;
@@ -65,7 +65,7 @@ public class ExperimentResource extends
*
* @return submitted date
*/
- public Date getSubmittedDate() {
+ public Timestamp getSubmittedDate() {
return submittedDate;
}
@@ -73,7 +73,7 @@ public class ExperimentResource extends
*
* @param submittedDate submitted date
*/
- public void setSubmittedDate(Date submittedDate) {
+ public void setSubmittedDate(Timestamp submittedDate) {
this.submittedDate = submittedDate;
}
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/PublishWorkflowResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/PublishWorkflowResource.java?rev=1401847&r1=1401846&r2=1401847&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/PublishWorkflowResource.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/PublishWorkflowResource.java Wed Oct 24 19:54:43 2012
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
import javax.persistence.EntityManager;
import javax.persistence.Query;
-import java.sql.Date;
+import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.List;
@@ -41,7 +41,7 @@ public class PublishWorkflowResource ext
private final static Logger logger = LoggerFactory.getLogger(PublishWorkflowResource.class);
private String name;
private String version;
- private Date publishedDate;
+ private Timestamp publishedDate;
private String content;
private GatewayResource gateway;
private String createdUser;
@@ -113,7 +113,7 @@ public class PublishWorkflowResource ext
*
* @return published date
*/
- public Date getPublishedDate() {
+ public Timestamp getPublishedDate() {
return publishedDate;
}
@@ -137,7 +137,7 @@ public class PublishWorkflowResource ext
*
* @param publishedDate published date of the workflow
*/
- public void setPublishedDate(Date publishedDate) {
+ public void setPublishedDate(Timestamp publishedDate) {
this.publishedDate = publishedDate;
}
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/UserWorkflowResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/UserWorkflowResource.java?rev=1401847&r1=1401846&r2=1401847&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/UserWorkflowResource.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/UserWorkflowResource.java Wed Oct 24 19:54:43 2012
@@ -33,7 +33,6 @@ import org.slf4j.LoggerFactory;
import javax.persistence.EntityManager;
import javax.persistence.Query;
-import java.sql.Date;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.List;
@@ -43,7 +42,7 @@ public class UserWorkflowResource extend
private GatewayResource gateway;
private WorkerResource worker;
private String name;
- private Date lastUpdateDate;
+ private Timestamp lastUpdateDate;
private String content;
private String path;
@@ -60,7 +59,7 @@ public class UserWorkflowResource extend
return name;
}
- public void setLastUpdateDate(Date lastUpdateDate) {
+ public void setLastUpdateDate(Timestamp lastUpdateDate) {
this.lastUpdateDate = lastUpdateDate;
}
@@ -68,7 +67,7 @@ public class UserWorkflowResource extend
this.content = content;
}
- public Date getLastUpdateDate() {
+ public Timestamp getLastUpdateDate() {
return lastUpdateDate;
}
@@ -142,7 +141,7 @@ public class UserWorkflowResource extend
userWorkflow.setTemplate_name(name);
if(lastUpdateDate == null){
java.util.Date date= new java.util.Date();
- lastUpdateDate = new java.sql.Date(date.getTime());
+ lastUpdateDate = new Timestamp(date.getTime());
}
userWorkflow.setLast_updated_date(lastUpdateDate);
byte[] bytes = content.getBytes();
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ConfigurationResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ConfigurationResourceTest.java?rev=1401847&r1=1401846&r2=1401847&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ConfigurationResourceTest.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ConfigurationResourceTest.java Wed Oct 24 19:54:43 2012
@@ -25,6 +25,7 @@ import org.apache.airavata.persistance.r
import org.apache.airavata.persistance.registry.jpa.util.Initialize;
import java.sql.Date;
+import java.sql.Timestamp;
import java.util.Calendar;
public class ConfigurationResourceTest extends AbstractResourceTest {
@@ -41,7 +42,7 @@ public class ConfigurationResourceTest e
configuration.setConfigVal("testConfigValue");
Calendar calender = Calendar.getInstance();
java.util.Date d = calender.getTime();
- Date currentTime = new Date(d.getTime());
+ Timestamp currentTime = new Timestamp(d.getTime());
configuration.setExpireDate(currentTime);
configuration.save();
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentMetadataResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentMetadataResourceTest.java?rev=1401847&r1=1401846&r2=1401847&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentMetadataResourceTest.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentMetadataResourceTest.java Wed Oct 24 19:54:43 2012
@@ -25,6 +25,7 @@ package org.apache.airavata.persistance.
import org.apache.airavata.persistance.registry.jpa.resources.*;
import java.sql.Date;
+import java.sql.Timestamp;
import java.util.Calendar;
public class ExperimentMetadataResourceTest extends AbstractResourceTest {
@@ -46,7 +47,7 @@ public class ExperimentMetadataResourceT
Calendar calender = Calendar.getInstance();
java.util.Date d = calender.getTime();
- Date currentDate = new Date(d.getTime());
+ Timestamp currentDate = new Timestamp(d.getTime());
experimentResource.setSubmittedDate(currentDate);
experimentResource.save();
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentResourceTest.java?rev=1401847&r1=1401846&r2=1401847&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentResourceTest.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentResourceTest.java Wed Oct 24 19:54:43 2012
@@ -24,6 +24,7 @@ package org.apache.airavata.persistance.
import org.apache.airavata.persistance.registry.jpa.resources.*;
import java.sql.Date;
+import java.sql.Timestamp;
import java.util.Calendar;
public class ExperimentResourceTest extends AbstractResourceTest {
@@ -44,7 +45,7 @@ public class ExperimentResourceTest exte
experimentResource.setProject(new ProjectResource(workerResource, gatewayResource, "testProject"));
Calendar calender = Calendar.getInstance();
java.util.Date d = calender.getTime();
- Date currentDate = new Date(d.getTime());
+ Timestamp currentDate = new Timestamp(d.getTime());
experimentResource.setSubmittedDate(currentDate);
experimentResource.save();
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GatewayResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GatewayResourceTest.java?rev=1401847&r1=1401846&r2=1401847&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GatewayResourceTest.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GatewayResourceTest.java Wed Oct 24 19:54:43 2012
@@ -24,6 +24,7 @@ package org.apache.airavata.persistance.
import org.apache.airavata.persistance.registry.jpa.resources.*;
import java.sql.Date;
+import java.sql.Timestamp;
import java.util.Calendar;
@@ -80,7 +81,7 @@ public class GatewayResourceTest extends
Calendar calender = Calendar.getInstance();
java.util.Date d = calender.getTime();
- Date currentTime = new Date(d.getTime());
+ Timestamp currentTime = new Timestamp(d.getTime());
userWorkflowResource.setName("workflow1");
userWorkflowResource.setLastUpdateDate(currentTime);
userWorkflowResource.setWorker(workerResource);
@@ -92,7 +93,7 @@ public class GatewayResourceTest extends
publishWorkflowResource.setContent("testContent");
Calendar c = Calendar.getInstance();
java.util.Date da = c.getTime();
- Date time = new Date(da.getTime());
+ Timestamp time = new Timestamp(da.getTime());
publishWorkflowResource.setPublishedDate(time);
publishWorkflowResource.save();
@@ -200,14 +201,14 @@ public class GatewayResourceTest extends
Calendar calender = Calendar.getInstance();
java.util.Date d = calender.getTime();
- Date currentTime = new Date(d.getTime());
+ Timestamp currentTime = new Timestamp(d.getTime());
publishWorkflowResource.setName("pubworkflow1");
publishWorkflowResource.setCreatedUser("testUser");
publishWorkflowResource.setContent("testContent");
Calendar c = Calendar.getInstance();
java.util.Date da = c.getTime();
- Date time = new Date(da.getTime());
+ Timestamp time = new Timestamp(da.getTime());
publishWorkflowResource.setPublishedDate(time);
publishWorkflowResource.save();
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ProjectResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ProjectResourceTest.java?rev=1401847&r1=1401846&r2=1401847&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ProjectResourceTest.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ProjectResourceTest.java Wed Oct 24 19:54:43 2012
@@ -27,6 +27,7 @@ import org.apache.airavata.persistance.r
import org.apache.airavata.persistance.registry.jpa.resources.WorkerResource;
import java.sql.Date;
+import java.sql.Timestamp;
import java.util.Calendar;
public class ProjectResourceTest extends AbstractResourceTest {
@@ -50,7 +51,7 @@ public class ProjectResourceTest extends
experimentResource.setWorker(workerResource);
Calendar calender = Calendar.getInstance();
java.util.Date d = calender.getTime();
- Date currentTime = new Date(d.getTime());
+ Timestamp currentTime = new Timestamp(d.getTime());
experimentResource.setSubmittedDate(currentTime);
experimentResource.setProject(projectResource);
experimentResource.save();
@@ -86,7 +87,7 @@ public class ProjectResourceTest extends
experimentResource.setWorker(workerResource);
Calendar calender = Calendar.getInstance();
java.util.Date d = calender.getTime();
- Date currentTime = new Date(d.getTime());
+ Timestamp currentTime = new Timestamp(d.getTime());
experimentResource.setSubmittedDate(currentTime);
experimentResource.setProject(projectResource);
experimentResource.save();
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/PublishWorkflowResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/PublishWorkflowResourceTest.java?rev=1401847&r1=1401846&r2=1401847&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/PublishWorkflowResourceTest.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/PublishWorkflowResourceTest.java Wed Oct 24 19:54:43 2012
@@ -25,6 +25,7 @@ import org.apache.airavata.persistance.r
import org.apache.airavata.persistance.registry.jpa.resources.PublishWorkflowResource;
import java.sql.Date;
+import java.sql.Timestamp;
import java.util.Calendar;
public class PublishWorkflowResourceTest extends AbstractResourceTest {
@@ -40,7 +41,7 @@ public class PublishWorkflowResourceTest
publishWorkflowResource.setContent("testContent");
Calendar calender = Calendar.getInstance();
java.util.Date d = calender.getTime();
- Date currentTime = new Date(d.getTime());
+ Timestamp currentTime = new Timestamp(d.getTime());
publishWorkflowResource.setPublishedDate(currentTime);
}
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserWorkflowResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserWorkflowResourceTest.java?rev=1401847&r1=1401846&r2=1401847&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserWorkflowResourceTest.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserWorkflowResourceTest.java Wed Oct 24 19:54:43 2012
@@ -26,6 +26,7 @@ import org.apache.airavata.persistance.r
import org.apache.airavata.persistance.registry.jpa.resources.WorkerResource;
import java.sql.Date;
+import java.sql.Timestamp;
import java.util.Calendar;
public class UserWorkflowResourceTest extends AbstractResourceTest {
@@ -44,7 +45,7 @@ public class UserWorkflowResourceTest ex
userWorkflowResource.setContent("testContent");
Calendar calender = Calendar.getInstance();
java.util.Date d = calender.getTime();
- Date currentTime = new Date(d.getTime());
+ Timestamp currentTime = new Timestamp(d.getTime());
userWorkflowResource.setLastUpdateDate(currentTime);
}
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkerResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkerResourceTest.java?rev=1401847&r1=1401846&r2=1401847&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkerResourceTest.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkerResourceTest.java Wed Oct 24 19:54:43 2012
@@ -24,6 +24,7 @@ package org.apache.airavata.persistance.
import org.apache.airavata.persistance.registry.jpa.resources.*;
import java.sql.Date;
+import java.sql.Timestamp;
import java.util.Calendar;
public class WorkerResourceTest extends AbstractResourceTest {
@@ -57,7 +58,7 @@ public class WorkerResourceTest extends
experimentResource.setProject(testProject);
Calendar calender = Calendar.getInstance();
java.util.Date d = calender.getTime();
- Date currentTime = new Date(d.getTime());
+ Timestamp currentTime = new Timestamp(d.getTime());
experimentResource.setSubmittedDate(currentTime);
experimentResource.save();
}
@@ -109,7 +110,7 @@ public class WorkerResourceTest extends
experimentResource.setProject(testProject);
Calendar calender = Calendar.getInstance();
java.util.Date d = calender.getTime();
- Date currentTime = new Date(d.getTime());
+ Timestamp currentTime = new Timestamp(d.getTime());
experimentResource.setSubmittedDate(currentTime);
experimentResource.save();