airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject git commit: changing transfer description to CLOB
Date Wed, 12 Mar 2014 15:44:43 GMT
Repository: airavata
Updated Branches:
  refs/heads/master bb988d377 -> 922686bfd


changing transfer description to CLOB


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/922686bf
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/922686bf
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/922686bf

Branch: refs/heads/master
Commit: 922686bfdb9d43f2856c9fdbfc9ec6c47af5f1a8
Parents: bb988d3
Author: chathuri <chathuri@apache.org>
Authored: Wed Mar 12 11:44:36 2014 -0400
Committer: chathuri <chathuri@apache.org>
Committed: Wed Mar 12 11:44:36 2014 -0400

----------------------------------------------------------------------
 .../src/main/resources/registry-derby.sql                 |  2 +-
 .../src/main/resources/registry-mysql.sql                 |  2 +-
 .../airavata/integration/WorkflowIntegrationTestBase.java |  6 +++---
 .../src/test/resources/airavata-server.properties         | 10 ++++------
 .../src/test/resources/registry-derby.sql                 |  2 +-
 .../registry/jpa/model/DataTransferDetail.java            |  7 ++++---
 .../jpa/resources/DataTransferDetailResource.java         | 10 +++++++---
 .../persistance/registry/jpa/resources/Utils.java         |  5 ++++-
 .../src/main/resources/registry-derby.sql                 |  2 +-
 .../src/main/resources/registry-mysql.sql                 |  2 +-
 .../src/test/resources/registry-derby.sql                 |  2 +-
 11 files changed, 28 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/922686bf/airavata-api/airavata-api-server/src/main/resources/registry-derby.sql
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/resources/registry-derby.sql b/airavata-api/airavata-api-server/src/main/resources/registry-derby.sql
index 245ae19..e1bf9e6 100644
--- a/airavata-api/airavata-api-server/src/main/resources/registry-derby.sql
+++ b/airavata-api/airavata-api-server/src/main/resources/registry-derby.sql
@@ -278,7 +278,7 @@ CREATE TABLE DATA_TRANSFER_DETAIL
         TRANSFER_ID VARCHAR(255),
         TASK_ID VARCHAR(255),
         CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-        TRANSFER_DESC VARCHAR(255),
+        TRANSFER_DESC CLOB,
         PRIMARY KEY(TRANSFER_ID),
         FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
 );

http://git-wip-us.apache.org/repos/asf/airavata/blob/922686bf/airavata-api/airavata-api-server/src/main/resources/registry-mysql.sql
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/resources/registry-mysql.sql b/airavata-api/airavata-api-server/src/main/resources/registry-mysql.sql
index 020dfd5..b16c651 100644
--- a/airavata-api/airavata-api-server/src/main/resources/registry-mysql.sql
+++ b/airavata-api/airavata-api-server/src/main/resources/registry-mysql.sql
@@ -260,7 +260,7 @@ CREATE TABLE DATA_TRANSFER_DETAIL
         TRANSFER_ID VARCHAR(255),
         TASK_ID VARCHAR(255),
         CREATION_TIME TIMESTAMP DEFAULT NOW(),
-        TRANSFER_DESC VARCHAR(255),
+        TRANSFER_DESC LONGTEXT,
         PRIMARY KEY(TRANSFER_ID),
         FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
 );

http://git-wip-us.apache.org/repos/asf/airavata/blob/922686bf/modules/integration-tests/src/test/java/org/apache/airavata/integration/WorkflowIntegrationTestBase.java
----------------------------------------------------------------------
diff --git a/modules/integration-tests/src/test/java/org/apache/airavata/integration/WorkflowIntegrationTestBase.java
b/modules/integration-tests/src/test/java/org/apache/airavata/integration/WorkflowIntegrationTestBase.java
index b9c4737..6885cbc 100644
--- a/modules/integration-tests/src/test/java/org/apache/airavata/integration/WorkflowIntegrationTestBase.java
+++ b/modules/integration-tests/src/test/java/org/apache/airavata/integration/WorkflowIntegrationTestBase.java
@@ -134,9 +134,9 @@ public abstract class WorkflowIntegrationTestBase {
     public void setUpEnvironment() throws Exception {
 
         log("..................Validating myproxy username, password set properly .............................");
-//        System.setProperty("myproxy.user", "ogce");
-//        System.setProperty("myproxy.password", "");
-//        System.setProperty("trusted.cert.location", "/Users/chathuri/dev/airavata/cert/certificates");
+        System.setProperty("myproxy.user", "ogce");
+        System.setProperty("myproxy.password", "/Users/chathuri/dev/airavata/cert/certificates");
+        System.setProperty("trusted.cert.location", "/Users/chathuri/dev/airavata/cert/certificates");
         String myProxyUserName = System.getProperty("myproxy.user");
         String myProxyPassword = System.getProperty("myproxy.password");
         String certLocation = System.getProperty("trusted.cert.location");

http://git-wip-us.apache.org/repos/asf/airavata/blob/922686bf/modules/integration-tests/src/test/resources/airavata-server.properties
----------------------------------------------------------------------
diff --git a/modules/integration-tests/src/test/resources/airavata-server.properties b/modules/integration-tests/src/test/resources/airavata-server.properties
index 623b552..74220c2 100644
--- a/modules/integration-tests/src/test/resources/airavata-server.properties
+++ b/modules/integration-tests/src/test/resources/airavata-server.properties
@@ -103,7 +103,7 @@ myproxy.user=ogce
 myproxy.pass=
 myproxy.life=3600
 # XSEDE Trusted certificates can be downloaded from https://software.xsede.org/security/xsede-certs.tar.gz
-trusted.cert.location=/Users/chathuri/dev/airavata/cert/certificates
+trusted.cert.location=/Users/lahirugunathilake/Downloads/certificates
 # SSH PKI key pair or ssh password can be used SSH based authentication is used.
 # if user specify both password authentication gets the higher preference
 
@@ -256,11 +256,11 @@ TwoPhase=true
 ###---------------------------Monitoring module Configurations---------------------------###
 #This will be the primary monitoring tool which runs in airavata, in future there will be
multiple monitoring
 #mechanisms and one would be able to start a monitor
-primaryMonitor=org.apache.airavata.job.monitor.impl.pull.qstat.QstatMonitor
-#We do not support a secondaray monitoring at this point or host specific monitoring
-secondaryMonitor=org.apache.airavata.job.monitor.impl.push.amqp.AMQPMonitor
+monitors=org.apache.airavata.job.monitor.impl.pull.qstat.QstatMonitor
+#,org.apache.airavata.job.monitor.impl.push.amqp.AMQPMonitor
 #This is the amqp related configuration and this lists down the Rabbitmq host, this is an
xsede specific configuration
 amqp.hosts=info1.dyn.teragrid.org,info2.dyn.teragrid.org
+proxy.file.path=/Users/lahirugunathilake/Downloads/x509up_u503876
 connection.name=xsede_private
 
 
@@ -278,5 +278,3 @@ orchestrator=org.apache.airavata.orchestrator.server.OrchestratorServer
 apiserver=org.apache.airavata.api.server.AiravataAPIServer
 
 servers=apiserver,orchestrator
-
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/922686bf/modules/orchestrator/orchestrator-core/src/test/resources/registry-derby.sql
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/test/resources/registry-derby.sql
b/modules/orchestrator/orchestrator-core/src/test/resources/registry-derby.sql
index 245ae19..e1bf9e6 100644
--- a/modules/orchestrator/orchestrator-core/src/test/resources/registry-derby.sql
+++ b/modules/orchestrator/orchestrator-core/src/test/resources/registry-derby.sql
@@ -278,7 +278,7 @@ CREATE TABLE DATA_TRANSFER_DETAIL
         TRANSFER_ID VARCHAR(255),
         TASK_ID VARCHAR(255),
         CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-        TRANSFER_DESC VARCHAR(255),
+        TRANSFER_DESC CLOB,
         PRIMARY KEY(TRANSFER_ID),
         FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
 );

http://git-wip-us.apache.org/repos/asf/airavata/blob/922686bf/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/DataTransferDetail.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/DataTransferDetail.java
b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/DataTransferDetail.java
index 496d2e5..13497a3 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/DataTransferDetail.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/DataTransferDetail.java
@@ -34,8 +34,9 @@ public class DataTransferDetail {
     private String taskId;
     @Column(name = "CREATION_TIME")
     private Timestamp creationTime;
+    @Lob
     @Column(name = "TRANSFER_DESC")
-    private String transferDesc;
+    private char[] transferDesc;
 
     @ManyToOne(cascade= CascadeType.MERGE)
     @JoinColumn(name = "TASK_ID")
@@ -65,11 +66,11 @@ public class DataTransferDetail {
         this.creationTime = creationTime;
     }
 
-    public String getTransferDesc() {
+    public char[] getTransferDesc() {
         return transferDesc;
     }
 
-    public void setTransferDesc(String transferDesc) {
+    public void setTransferDesc(char[] transferDesc) {
         this.transferDesc = transferDesc;
     }
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/922686bf/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/DataTransferDetailResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/DataTransferDetailResource.java
b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/DataTransferDetailResource.java
index 76849e1..501954d 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/DataTransferDetailResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/DataTransferDetailResource.java
@@ -183,13 +183,17 @@ public class DataTransferDetailResource extends AbstractResource {
         dataTransferDetail.setTask(taskDetail);
         dataTransferDetail.setTaskId(taskDetailResource.getTaskId());
         dataTransferDetail.setCreationTime(creationTime);
-        dataTransferDetail.setTransferDesc(transferDescription);
+        if (transferDescription != null){
+            dataTransferDetail.setTransferDesc(transferDescription.toCharArray());
+        }
         if (existingDF != null){
             existingDF.setTransferId(transferId);
             existingDF.setTask(taskDetail);
             existingDF.setTaskId(taskDetailResource.getTaskId());
             existingDF.setCreationTime(creationTime);
-            existingDF.setTransferDesc(transferDescription);
+            if (transferDescription != null){
+                existingDF.setTransferDesc(transferDescription.toCharArray());
+            }
             dataTransferDetail = em.merge(existingDF);
         }else {
             em.merge(dataTransferDetail);
@@ -202,7 +206,7 @@ public class DataTransferDetailResource extends AbstractResource {
         List<Resource> resources = get(ResourceType.STATUS);
         for (Resource resource : resources) {
             StatusResource dataTransferStatus = (StatusResource) resource;
-            if(dataTransferStatus.getStatusType().equals(StatusType.DATA_TRANSFER)){
+            if(dataTransferStatus.getStatusType().equals(StatusType.DATA_TRANSFER.toString())){
                 return dataTransferStatus;
             }
         }

http://git-wip-us.apache.org/repos/asf/airavata/blob/922686bf/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
index b9144be..6990eac 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
@@ -784,7 +784,10 @@ public class Utils {
             transferDetailResource.setTaskDetailResource(taskDetailResource);
             transferDetailResource.setTransferId(o.getTransferId());
             transferDetailResource.setCreationTime(o.getCreationTime());
-            transferDetailResource.setTransferDescription(o.getTransferDesc());
+            if (o.getTransferDesc() != null){
+                transferDetailResource.setTransferDescription(new String(o.getTransferDesc()));
+            }
+
         }
         return transferDetailResource;
     }

http://git-wip-us.apache.org/repos/asf/airavata/blob/922686bf/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql
b/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql
index 245ae19..e1bf9e6 100644
--- a/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql
+++ b/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql
@@ -278,7 +278,7 @@ CREATE TABLE DATA_TRANSFER_DETAIL
         TRANSFER_ID VARCHAR(255),
         TASK_ID VARCHAR(255),
         CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-        TRANSFER_DESC VARCHAR(255),
+        TRANSFER_DESC CLOB,
         PRIMARY KEY(TRANSFER_ID),
         FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
 );

http://git-wip-us.apache.org/repos/asf/airavata/blob/922686bf/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql
b/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql
index 020dfd5..b16c651 100644
--- a/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql
+++ b/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql
@@ -260,7 +260,7 @@ CREATE TABLE DATA_TRANSFER_DETAIL
         TRANSFER_ID VARCHAR(255),
         TASK_ID VARCHAR(255),
         CREATION_TIME TIMESTAMP DEFAULT NOW(),
-        TRANSFER_DESC VARCHAR(255),
+        TRANSFER_DESC LONGTEXT,
         PRIMARY KEY(TRANSFER_ID),
         FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
 );

http://git-wip-us.apache.org/repos/asf/airavata/blob/922686bf/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql
b/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql
index 245ae19..e1bf9e6 100644
--- a/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql
+++ b/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql
@@ -278,7 +278,7 @@ CREATE TABLE DATA_TRANSFER_DETAIL
         TRANSFER_ID VARCHAR(255),
         TASK_ID VARCHAR(255),
         CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-        TRANSFER_DESC VARCHAR(255),
+        TRANSFER_DESC CLOB,
         PRIMARY KEY(TRANSFER_ID),
         FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
 );


Mime
View raw message