You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2015/10/22 19:34:18 UTC

airavata git commit: changing db field name for order variable

Repository: airavata
Updated Branches:
  refs/heads/master 4cd7738d7 -> 6c43cc121


changing db field name for order variable


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

Branch: refs/heads/master
Commit: 6c43cc12142f9cef3d23275bde4e78c0071bffe1
Parents: 4cd7738
Author: scnakandala <su...@gmail.com>
Authored: Thu Oct 22 13:34:10 2015 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Thu Oct 22 13:34:10 2015 -0400

----------------------------------------------------------------------
 .../airavata/registry/core/app/catalog/model/AppEnvironment.java   | 2 +-
 .../airavata/registry/core/app/catalog/model/ModuleLoadCmd.java    | 2 +-
 .../airavata/registry/core/app/catalog/model/PostJobCommand.java   | 2 +-
 .../airavata/registry/core/app/catalog/model/PreJobCommand.java    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/6c43cc12/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/AppEnvironment.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/AppEnvironment.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/AppEnvironment.java
index 0f66647..edf1993 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/AppEnvironment.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/AppEnvironment.java
@@ -38,7 +38,7 @@ public class AppEnvironment implements Serializable {
     @Column(name = "VALUE")
     private String value;
 
-    @Column(name = "ORDER")
+    @Column(name = "ENV_ORDER")
     private Integer order;
 
     @ManyToOne(cascade= CascadeType.MERGE)

http://git-wip-us.apache.org/repos/asf/airavata/blob/6c43cc12/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ModuleLoadCmd.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ModuleLoadCmd.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ModuleLoadCmd.java
index e2c248c..0349629 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ModuleLoadCmd.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ModuleLoadCmd.java
@@ -37,7 +37,7 @@ public class ModuleLoadCmd implements Serializable {
     @Column(name = "APP_DEPLOYMENT_ID")
     private String appDeploymentId;
 
-    @Column(name = "ORDER")
+    @Column(name = "COMMAND_ORDER")
     private Integer order;
 
     @ManyToOne(cascade= CascadeType.MERGE)

http://git-wip-us.apache.org/repos/asf/airavata/blob/6c43cc12/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/PostJobCommand.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/PostJobCommand.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/PostJobCommand.java
index 7e5dd37..f3d0516 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/PostJobCommand.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/PostJobCommand.java
@@ -43,7 +43,7 @@ public class PostJobCommand implements Serializable {
     @Column(name = "COMMAND")
     private String command;
 
-    @Column(name = "ORDER")
+    @Column(name = "COMMAND_ORDER")
     private Integer order;
 
     @ManyToOne(cascade= CascadeType.MERGE)

http://git-wip-us.apache.org/repos/asf/airavata/blob/6c43cc12/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/PreJobCommand.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/PreJobCommand.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/PreJobCommand.java
index f08f5ed..d67bd48 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/PreJobCommand.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/PreJobCommand.java
@@ -43,7 +43,7 @@ public class PreJobCommand implements Serializable {
     @Column(name = "COMMAND")
     private String command;
 
-    @Column(name = "ORDER")
+    @Column(name = "COMMAND_ORDER")
     private Integer order;
 
     @ManyToOne(cascade= CascadeType.MERGE)