You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2012/09/13 22:46:09 UTC
svn commit: r1384518 - in
/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa:
model/ resources/
Author: lahiru
Date: Thu Sep 13 20:46:08 2012
New Revision: 1384518
URL: http://svn.apache.org/viewvc?rev=1384518&view=rev
Log:
updating models
Modified:
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment.java
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Gateway_Worker.java
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Project.java
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Published_Workflow.java
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Service_Descriptor.java
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/User_Workflow.java
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ServiceDescriptorResource.java
Modified: incubator/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/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment.java?rev=1384518&r1=1384517&r2=1384518&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment.java (original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment.java Thu Sep 13 20:46:08 2012
@@ -21,10 +21,7 @@
package org.apache.airavata.persistance.registry.jpa.model;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
+import javax.persistence.*;
import java.sql.Date;
@Entity
@@ -33,15 +30,15 @@ public class Experiment {
private String experiment_ID;
private Date submitted_date;
- @ManyToOne
+ @ManyToOne(cascade= CascadeType.MERGE)
@JoinColumn(name = "user_name")
private Users user;
- @ManyToOne
+ @ManyToOne(cascade=CascadeType.MERGE)
@JoinColumn(name = "gateway_name")
private Gateway gateway;
- @ManyToOne
+ @ManyToOne(cascade=CascadeType.MERGE)
@JoinColumn(name = "project_ID")
private Project project;
Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Gateway_Worker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Gateway_Worker.java?rev=1384518&r1=1384517&r2=1384518&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Gateway_Worker.java (original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Gateway_Worker.java Thu Sep 13 20:46:08 2012
@@ -31,12 +31,12 @@ public class Gateway_Worker {
@Id
private String user_name;
- @ManyToOne()
+ @ManyToOne(cascade=CascadeType.MERGE)
@JoinColumn(name = "gateway_name")
private Gateway gateway;
- @ManyToOne()
+ @ManyToOne(cascade=CascadeType.MERGE)
@JoinColumn(name = "user_name")
private Users user;
Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Project.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Project.java?rev=1384518&r1=1384517&r2=1384518&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Project.java (original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Project.java Thu Sep 13 20:46:08 2012
@@ -28,11 +28,11 @@ public class Project {
private int project_ID;
private String project_name;
- @ManyToOne
+ @ManyToOne(cascade=CascadeType.MERGE)
@JoinColumn(name = "gateway_name")
private Gateway gateway;
- @ManyToOne
+ @ManyToOne(cascade=CascadeType.MERGE)
@JoinColumn(name = "user_name")
private Users users;
Modified: incubator/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/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Published_Workflow.java?rev=1384518&r1=1384517&r2=1384518&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Published_Workflow.java (original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Published_Workflow.java Thu Sep 13 20:46:08 2012
@@ -20,12 +20,7 @@
*/
package org.apache.airavata.persistance.registry.jpa.model;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
+import javax.persistence.*;
import java.sql.Date;
@Entity
@@ -38,7 +33,7 @@ public class Published_Workflow {
@Id
private String gateway_name;
- @ManyToOne
+ @ManyToOne(cascade= CascadeType.MERGE)
@JoinColumn(name = "gateway_name")
private Gateway gateway;
@@ -47,7 +42,7 @@ public class Published_Workflow {
private String workflow_content;
private String path;
- @ManyToOne
+ @ManyToOne(cascade=CascadeType.MERGE)
@JoinColumn(name = "created_user", referencedColumnName = "user_name")
private Users user;
Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Service_Descriptor.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Service_Descriptor.java?rev=1384518&r1=1384517&r2=1384518&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Service_Descriptor.java (original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Service_Descriptor.java Thu Sep 13 20:46:08 2012
@@ -30,14 +30,13 @@ public class Service_Descriptor {
@Id
private String gateway_name;
- private String updated_user;
private String service_descriptor_xml;
- @ManyToOne
+ @ManyToOne(cascade=CascadeType.MERGE)
@JoinColumn(name = "gateway_name")
private Gateway gateway;
-// @ManyToOne
+ @ManyToOne(cascade=CascadeType.MERGE)
@JoinColumn(name = "updated_user", referencedColumnName = "user_name")
private Users user;
@@ -80,14 +79,6 @@ public class Service_Descriptor {
public void setGateway_name(String gateway_name) {
this.gateway_name = gateway_name;
}
-
- public String getUpdated_user() {
- return updated_user;
- }
-
- public void setUpdated_user(String updated_user) {
- this.updated_user = updated_user;
- }
}
Modified: incubator/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/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/User_Workflow.java?rev=1384518&r1=1384517&r2=1384518&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/User_Workflow.java (original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/User_Workflow.java Thu Sep 13 20:46:08 2012
@@ -20,11 +20,7 @@
*/
package org.apache.airavata.persistance.registry.jpa.model;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
+import javax.persistence.*;
import java.sql.Date;
@Entity
@@ -37,11 +33,11 @@ public class User_Workflow {
@Id
private String template_name;
- @ManyToOne
+ @ManyToOne(cascade= CascadeType.MERGE)
@JoinColumn(name = "gateway_name")
private Gateway gateway;
- @ManyToOne
+ @ManyToOne(cascade=CascadeType.MERGE)
@JoinColumn(name = "owner", referencedColumnName = "user_name")
private Users user;
Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ServiceDescriptorResource.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ServiceDescriptorResource.java?rev=1384518&r1=1384517&r2=1384518&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ServiceDescriptorResource.java (original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ServiceDescriptorResource.java Thu Sep 13 20:46:08 2012
@@ -144,12 +144,12 @@ public class ServiceDescriptorResource e
gateway.setGateway_name(gatewayName);
serviceDescriptor.setGateway(gateway);
serviceDescriptor.setService_descriptor_xml(content);
-// Users user = new Users();
-// user.setUser_name(userName);
-// serviceDescriptor.setUser(user);
- serviceDescriptor.setUpdated_user(userName);
+ Users user = new Users();
+ user.setUser_name(userName);
+ serviceDescriptor.setUser(user);
+ serviceDescriptor.setUser(user);
if(existingServiceDesc != null) {
- existingServiceDesc.setUpdated_user(userName);
+ existingServiceDesc.setUser(user);
existingServiceDesc.setService_descriptor_xml(content);
serviceDescriptor = em.merge(existingServiceDesc);
}else {