airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject svn commit: r1387759 - in /incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main: java/org/apache/airavata/persistance/registry/jpa/model/ resources/
Date Wed, 19 Sep 2012 21:19:43 GMT
Author: lahiru
Date: Wed Sep 19 21:19:42 2012
New Revision: 1387759

URL: http://svn.apache.org/viewvc?rev=1387759&view=rev
Log:
change varchar fields of some tables to BLOB and update the model accordingly

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/Host_Descriptor.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/resources/data-derby.sql
    incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-mysql.sql

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=1387759&r1=1387758&r2=1387759&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
Wed Sep 19 21:19:42 2012
@@ -33,6 +33,8 @@ public class Application_Descriptor {
 
     private String host_descriptor_ID;
     private String service_descriptor_ID;
+
+    @Lob
     private String application_descriptor_xml;
 
     @ManyToOne(cascade=CascadeType.PERSIST)

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=1387759&r1=1387758&r2=1387759&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
Wed Sep 19 21:19:42 2012
@@ -29,6 +29,7 @@ public class Host_Descriptor {
     private String host_descriptor_ID;
     @Id
     private String gateway_name;
+    @Lob
     private String host_descriptor_xml;
 
     @ManyToOne(cascade=CascadeType.MERGE)

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=1387759&r1=1387758&r2=1387759&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
Wed Sep 19 21:19:42 2012
@@ -29,7 +29,7 @@ public class Service_Descriptor {
     private String service_descriptor_ID;
     @Id
     private String gateway_name;
-
+    @Lob
     private String service_descriptor_xml;
 
     @ManyToOne(cascade=CascadeType.MERGE)

Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-derby.sql
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-derby.sql?rev=1387759&r1=1387758&r2=1387759&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-derby.sql
(original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-derby.sql
Wed Sep 19 21:19:42 2012
@@ -97,7 +97,7 @@ create table Host_Descriptor
        gateway_name varchar(255),
        updated_user varchar(255),
        host_descriptor_ID varchar(255),
-       host_descriptor_xml varchar(2000),
+       host_descriptor_xml BLOB,
        PRIMARY KEY(gateway_name, host_descriptor_ID),
        FOREIGN KEY (gateway_name) REFERENCES Gateway(gateway_name) ON DELETE CASCADE,
        FOREIGN KEY (updated_user) REFERENCES Users(user_name) ON DELETE CASCADE
@@ -108,7 +108,7 @@ create table Service_Descriptor
          gateway_name varchar(255),
          updated_user varchar(255),
          service_descriptor_ID varchar(255),
-         service_descriptor_xml varchar(2000),
+         service_descriptor_xml BLOB,
          PRIMARY KEY(gateway_name,service_descriptor_ID),
          FOREIGN KEY (gateway_name) REFERENCES Gateway(gateway_name) ON DELETE CASCADE,
          FOREIGN KEY (updated_user) REFERENCES Users(user_name) ON DELETE CASCADE
@@ -121,7 +121,7 @@ create table Application_Descriptor
          application_descriptor_ID varchar(255),
          host_descriptor_ID varchar(255),
          service_descriptor_ID varchar(255),
-         application_descriptor_xml varchar(2000),
+         application_descriptor_xml BLOB,
          PRIMARY KEY(gateway_name,application_descriptor_ID),
          FOREIGN KEY (gateway_name) REFERENCES Gateway(gateway_name) ON DELETE CASCADE,
          FOREIGN KEY (updated_user) REFERENCES Users(user_name) ON DELETE CASCADE
@@ -163,7 +163,7 @@ create table Workflow_Data
        template_name varchar(255),
        status varchar(100),
        start_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-       last_update_time TIMESTAMP DEFAULT now() on update now(),
+       last_update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
        PRIMARY KEY(workflow_instanceID),
        FOREIGN KEY (experiment_ID) REFERENCES Experiment_Data(experiment_ID) ON DELETE CASCADE
 );
@@ -177,7 +177,7 @@ create table Node_Data
        outputs BLOB,
        status varchar(100),
        start_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-       last_update_time TIMESTAMP DEFAULT now() on update now(),
+       last_update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
        PRIMARY KEY(workflow_instanceID, node_id),
        FOREIGN KEY (workflow_instanceID) REFERENCES Workflow_Data(workflow_instanceID) ON
DELETE CASCADE
 );

Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-mysql.sql
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-mysql.sql?rev=1387759&r1=1387758&r2=1387759&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-mysql.sql
(original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-mysql.sql
Wed Sep 19 21:19:42 2012
@@ -95,7 +95,7 @@ create table Host_Descriptor
        gateway_name varchar(255),
        updated_user varchar(255),
        host_descriptor_ID varchar(255),
-       host_descriptor_xml varchar(2000),
+       host_descriptor_xml BLOB,
        PRIMARY KEY(gateway_name, host_descriptor_ID),
        FOREIGN KEY (gateway_name) REFERENCES Gateway(gateway_name) ON DELETE CASCADE,
        FOREIGN KEY (updated_user) REFERENCES Users(user_name) ON DELETE CASCADE
@@ -106,7 +106,7 @@ create table Service_Descriptor
          gateway_name varchar(255),
          updated_user varchar(255),
          service_descriptor_ID varchar(255),
-         service_descriptor_xml varchar(2000),
+         service_descriptor_xml BLOB,
          PRIMARY KEY(gateway_name,service_descriptor_ID),
          FOREIGN KEY (gateway_name) REFERENCES Gateway(gateway_name) ON DELETE CASCADE,
          FOREIGN KEY (updated_user) REFERENCES Users(user_name) ON DELETE CASCADE
@@ -119,7 +119,7 @@ create table Application_Descriptor
          application_descriptor_ID varchar(255),
          host_descriptor_ID varchar(255),
          service_descriptor_ID varchar(255),
-         application_descriptor_xml varchar(2000),
+         application_descriptor_xml BLOB,
          PRIMARY KEY(gateway_name,application_descriptor_ID),
          FOREIGN KEY (gateway_name) REFERENCES Gateway(gateway_name) ON DELETE CASCADE,
          FOREIGN KEY (updated_user) REFERENCES Users(user_name) ON DELETE CASCADE



Mime
View raw message