airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [5/9] airavata git commit: Removing application id field from experiment table
Date Mon, 22 Jun 2015 12:01:43 GMT
Removing application id field from experiment table


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

Branch: refs/heads/master
Commit: fb30f5df438f7acff649b550955a2600df9c84f7
Parents: bce94ae
Author: Supun Nakandala <scnakandala@apache.org>
Authored: Sun Jun 21 23:11:52 2015 +0530
Committer: Supun Nakandala <scnakandala@apache.org>
Committed: Sun Jun 21 23:11:52 2015 +0530

----------------------------------------------------------------------
 .../src/main/java/META-INF/persistence.xml      | 105 +++++++++++++++++++
 .../experiment/catalog/model/Experiment.java    |  14 ---
 .../catalog/resources/ExperimentResource.java   |  10 --
 3 files changed, 105 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/fb30f5df/modules/registry/registry-core/src/main/java/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/META-INF/persistence.xml b/modules/registry/registry-core/src/main/java/META-INF/persistence.xml
new file mode 100644
index 0000000..ddf1334
--- /dev/null
+++ b/modules/registry/registry-core/src/main/java/META-INF/persistence.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="2.0">
+    <persistence-unit name="experiment_data">
+        <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.Experiment</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.ExperimentError</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.ExperimentInput</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.ExperimentOutput</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.ExperimentStatus</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.ExperimentSummary</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.Gateway</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.GatewayWorker</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.Process</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.ProcessError</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.ProcessInput</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.ProcessOutput</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.ProcessResourceSchedule</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.ProcessStatus</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.Project</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.ProjectUser</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.Task</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.TaskError</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.TaskStatus</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.User</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.UserConfigurationData</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.BatchQueue</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.LocalSubmission</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.JobManagerCommand</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.SshJobSubmission</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.ComputeResourceFileSystem</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.ErrorDetail</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.GridftpDataMovement</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.ScpDataMovement</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.PostJobCommand</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.ResourceJobManager</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.PreJobCommand</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.ComputeResource</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.GSISSHExport</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.ComputeResourcePreference</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.LocalDataMovement</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.DataTransferDetail</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.Gateway</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.WorkflowNodeDetail</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.Computational_Resource_Scheduling</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.JobDetail</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.ApplicationInput</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.TaskDetail</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.Workflow</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.ApplicationInterface</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.ApplicationOutput</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.Status</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.GatewayProfile</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.Project</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.AdvancedOutputDataHandling</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.ApplicationModule</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.Configuration</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.Experiment</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.CloudJobSubmission</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.Experiment_Output</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.QosParam</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.AdvancedInputDataHandling</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.ProjectUser</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.NodeInput</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.Experiment_Input</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.Configuration</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.ModuleLoadCmd</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.Gateway_Worker</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.NodeOutput</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.Users</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.ExperimentConfigData</class>
+        <class>org.apache.airavata.registry.core.experiment.catalog.model.Notification_Email</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.UnicoreDataMovement</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.UnicoreJobSubmission</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.ApplicationDeployment</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.HostAlias</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.HostIPAddress</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.LibraryApendPath</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.GSISSHSubmission</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.GlobusGKEndpoint</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.AppModuleMapping</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.LibraryPrepandPath</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.ApplicationIntInput</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.ApplicationIntOutput</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.WorkflowInput</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.WorkflowOutput</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.AppEnvironment</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.GlobusJobSubmission</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.DataMovementInterface</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.JobSubmissionInterface</class>
+        <class>org.apache.airavata.registry.core.app.catalog.model.GridftpEndpoint</class>
+        <exclude-unlisted-classes>true</exclude-unlisted-classes>
+        <properties>
+            <property name="openjpa.ConnectionURL"
+                      value="jdbc:mysql://localhost:3306/experiment_catalog" />
+            <property name="openjpa.ConnectionDriverName" value="com.mysql.jdbc.Driver"
/>
+            <property name="openjpa.ConnectionUserName" value="root" />
+            <property name="openjpa.ConnectionPassword" value="" />
+            <property name="openjpa.DynamicEnhancementAgent" value="true" />
+            <property name="openjpa.RuntimeUnenhancedClasses" value="supported" />
+            <property name="openjpa.Log" value="SQL=TRACE" />
+            <property name="openjpa.ConnectionFactoryProperties"
+                      value="PrettyPrint=true, PrettyPrintLineLength=72, PrintParameters=true,
MaxActive=10, MaxIdle=5, MinIdle=2, MaxWait=60000" />
+        </properties>
+    </persistence-unit>
+</persistence>

http://git-wip-us.apache.org/repos/asf/airavata/blob/fb30f5df/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Experiment.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Experiment.java
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Experiment.java
index 537d2e5..da5a486 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Experiment.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Experiment.java
@@ -35,7 +35,6 @@ public class Experiment {
     private String projectId;
     private String experimentType;
     private String userName;
-    private String applicationId;
     private String experimentName;
     private Timestamp creationTime;
     private String description;
@@ -93,16 +92,6 @@ public class Experiment {
     }
 
     @Basic
-    @Column(name = "APPLICATION_ID")
-    public String getApplicationId() {
-        return applicationId;
-    }
-
-    public void setApplicationId(String applicationId) {
-        this.applicationId = applicationId;
-    }
-
-    @Basic
     @Column(name = "EXPERIMENT_NAME")
     public String getExperimentName() {
         return experimentName;
@@ -179,8 +168,6 @@ public class Experiment {
 //
 //        Experiment that = (Experiment) o;
 //
-//        if (applicationId != null ? !applicationId.equals(that.applicationId) : that.applicationId
!= null)
-//            return false;
 //        if (creationTime != null ? !creationTime.equals(that.creationTime) : that.creationTime
!= null) return false;
 //        if (description != null ? !description.equals(that.description) : that.description
!= null) return false;
 //        if (emailAddresses != null ? !emailAddresses.equals(that.emailAddresses) : that.emailAddresses
!= null)
@@ -207,7 +194,6 @@ public class Experiment {
 //        result = 31 * result + (projectId != null ? projectId.hashCode() : 0);
 //        result = 31 * result + (experimentType != null ? experimentType.hashCode() : 0);
 //        result = 31 * result + (userName != null ? userName.hashCode() : 0);
-//        result = 31 * result + (applicationId != null ? applicationId.hashCode() : 0);
 //        result = 31 * result + (experimentName != null ? experimentName.hashCode() : 0);
 //        result = 31 * result + (creationTime != null ? creationTime.hashCode() : 0);
 //        result = 31 * result + (description != null ? description.hashCode() : 0);

http://git-wip-us.apache.org/repos/asf/airavata/blob/fb30f5df/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentResource.java
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentResource.java
index ae29a0d..166ef01 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentResource.java
@@ -43,7 +43,6 @@ public class ExperimentResource extends AbstractExpCatResource {
     private String projectId;
     private String experimentType;
     private String userName;
-    private String applicationId;
     private String experimentName;
     private Timestamp creationTime;
     private String description;
@@ -84,14 +83,6 @@ public class ExperimentResource extends AbstractExpCatResource {
         this.userName = userName;
     }
 
-    public String getApplicationId() {
-        return applicationId;
-    }
-
-    public void setApplicationId(String applicationId) {
-        this.applicationId = applicationId;
-    }
-
     public String getExperimentName() {
         return experimentName;
     }
@@ -451,7 +442,6 @@ public class ExperimentResource extends AbstractExpCatResource {
             experiment.setProjectId(projectId);
             experiment.setExperimentType(experimentType);
             experiment.setUserName(userName);
-            experiment.setApplicationId(applicationId);
             experiment.setExperimentName(experimentName);
             experiment.setCreationTime(creationTime);
             experiment.setDescription(description);


Mime
View raw message