airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject svn commit: r1382971 - /incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/
Date Mon, 10 Sep 2012 16:28:56 GMT
Author: lahiru
Date: Mon Sep 10 16:28:56 2012
New Revision: 1382971

URL: http://svn.apache.org/viewvc?rev=1382971&view=rev
Log:
updating jpa models

Modified:
    incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Application_Descriptor.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/Host_Descriptor.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

Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Application_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/Application_Descriptor.java?rev=1382971&r1=1382970&r2=1382971&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Application_Descriptor.java
(original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Application_Descriptor.java
Mon Sep 10 16:28:56 2012
@@ -32,10 +32,11 @@ public class Application_Descriptor {
     private String host_descriptor_ID;
     @Id
     private String service_descriptor_ID;
+    @Id
+    private String gateway_name;
 
     private String application_descriptor_xml;
 
-    @Id
     @ManyToOne
     @JoinColumn(name = "gateway_name")
     private Gateway gateway;
@@ -91,6 +92,14 @@ public class Application_Descriptor {
     public void setUser(Users user) {
         this.user = user;
     }
+
+    public String getGateway_name() {
+        return gateway_name;
+    }
+
+    public void setGateway_name(String gateway_name) {
+        this.gateway_name = gateway_name;
+    }
 }
 
 class Application_Descriptor_PK{

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=1382971&r1=1382970&r2=1382971&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
Mon Sep 10 16:28:56 2012
@@ -29,30 +29,28 @@ import javax.persistence.ManyToOne;
 @Entity
 @IdClass(Gateway_Worker_PK.class)
 public class Gateway_Worker {
-//    @Id
-//    private String gateway_name;
-//
-//    @Id
-//    private String user_name;
+    @Id
+    private String gateway_name;
 
     @Id
+    private String user_name;
+
     @ManyToOne
     @JoinColumn(name = "gateway_name")
     private Gateway gateway;
 
 
-    @Id
     @ManyToOne
     @JoinColumn(name = "user_name")
     private Users user;
 
-//    public String getUser_name() {
-//        return user_name;
-//    }
-//
-//    public void setUser_name(String user_name) {
-//        this.user_name = user_name;
-//    }
+    public String getUser_name() {
+        return user_name;
+    }
+
+    public void setUser_name(String user_name) {
+        this.user_name = user_name;
+    }
 
     public void setGateway(Gateway gateway) {
         this.gateway = gateway;
@@ -70,13 +68,13 @@ public class Gateway_Worker {
         this.user = user;
     }
 
-//    public String getGateway_name() {
-//        return gateway_name;
-//    }
-//
-//    public void setGateway_name(String gateway_name) {
-//        this.gateway_name = gateway_name;
-//    }
+    public String getGateway_name() {
+        return gateway_name;
+    }
+
+    public void setGateway_name(String gateway_name) {
+        this.gateway_name = gateway_name;
+    }
 }
 
 class Gateway_Worker_PK {

Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Host_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/Host_Descriptor.java?rev=1382971&r1=1382970&r2=1382971&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Host_Descriptor.java
(original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Host_Descriptor.java
Mon Sep 10 16:28:56 2012
@@ -27,9 +27,10 @@ import javax.persistence.*;
 public class Host_Descriptor {
     @Id
     private String host_descriptor_ID;
+    @Id
+    private String gateway_name;
     private String host_descriptor_xml;
 
-    @Id
     @ManyToOne
     @JoinColumn(name = "gateway_name")
     private Gateway gateway;
@@ -50,6 +51,14 @@ public class Host_Descriptor {
         return gateway;
     }
 
+    public String getGateway_name() {
+        return gateway_name;
+    }
+
+    public void setGateway_name(String gateway_name) {
+        this.gateway_name = gateway_name;
+    }
+
     public void setHost_descriptor_ID(String host_descriptor_ID) {
         this.host_descriptor_ID = host_descriptor_ID;
     }

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=1382971&r1=1382970&r2=1382971&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
Mon Sep 10 16:28:56 2012
@@ -36,6 +36,8 @@ public class Published_Workflow {
     private String publish_workflow_name;
 
     @Id
+    private String gateway_name;
+
     @ManyToOne
     @JoinColumn(name = "gateway_name")
     private Gateway gateway;
@@ -49,11 +51,6 @@ public class Published_Workflow {
     @JoinColumn(name = "user_name")
     private Users user;
 
-//    @Id
-//    private String gateway_name;
-
-
-
     public String getPublish_workflow_name() {
         return publish_workflow_name;
     }
@@ -98,13 +95,13 @@ public class Published_Workflow {
         this.path = path;
     }
 
-    //    public String getGateway_name() {
-//        return gateway_name;
-//    }
-//
-//    public void setGateway_name(String gateway_name) {
-//        this.gateway_name = gateway_name;
-//    }
+    public String getGateway_name() {
+        return gateway_name;
+    }
+
+    public void setGateway_name(String gateway_name) {
+        this.gateway_name = gateway_name;
+    }
 
     public Users getUser() {
         return 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=1382971&r1=1382970&r2=1382971&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
Mon Sep 10 16:28:56 2012
@@ -27,9 +27,11 @@ import javax.persistence.*;
 public class Service_Descriptor {
     @Id
     private String service_descriptor_ID;
+    @Id
+    private String gateway_name;
+
     private String service_descriptor_xml;
 
-    @Id
     @ManyToOne
     @JoinColumn(name = "gateway_name")
     private Gateway gateway;
@@ -69,6 +71,14 @@ public class Service_Descriptor {
     public void setUser(Users user) {
         this.user = user;
     }
+
+    public String getGateway_name() {
+        return gateway_name;
+    }
+
+    public void setGateway_name(String gateway_name) {
+        this.gateway_name = gateway_name;
+    }
 }
 
 class Service_Descriptor_PK{

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=1382971&r1=1382970&r2=1382971&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
Mon Sep 10 16:28:56 2012
@@ -31,30 +31,21 @@ import java.sql.Date;
 @IdClass(User_Workflow_PK.class)
 public class User_Workflow {
     @Id
+    private String gateway_name;
+    @Id
+    private String owner;
+    @Id
+    private String template_name;
+
     @ManyToOne
     @JoinColumn(name = "gateway_name")
     private Gateway gateway;
 
-    @Id
     @ManyToOne
     @JoinColumn(name = "user_name")
     private Users user;
 
-    @Id
-    private String template_name;
-
     private String path;
-
-//    @Id
-//    @ManyToOne
-//    @JoinColumn(name = "user_ID")
-//    private Users users;
-//
-//    @Id
-//    @ManyToOne
-//    @JoinColumn(name = "project_ID")
-//    private Project project;
-
     private Date last_updated_date;
     private String workflow_graph;
 
@@ -66,10 +57,6 @@ public class User_Workflow {
         return user;
     }
 
-//    public Project getProject() {
-//        return project;
-//    }
-
     public void setTemplate_name(String template_name) {
         this.template_name = template_name;
     }
@@ -82,6 +69,22 @@ public class User_Workflow {
         return gateway;
     }
 
+    public String getGateway_name() {
+        return gateway_name;
+    }
+
+    public String getOwner() {
+        return owner;
+    }
+
+    public void setGateway_name(String gateway_name) {
+        this.gateway_name = gateway_name;
+    }
+
+    public void setOwner(String owner) {
+        this.owner = owner;
+    }
+
     public String getPath() {
         return path;
     }
@@ -106,11 +109,6 @@ public class User_Workflow {
         this.workflow_graph = workflow_graph;
     }
 
-    //
-//    public void setProject(Project project) {
-//        this.project = project;
-//    }
-
     public void setLast_updated_date(Date last_updated_date) {
         this.last_updated_date = last_updated_date;
     }



Mime
View raw message