You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2015/09/25 17:18:27 UTC
airavata git commit: app catalog changes
Repository: airavata
Updated Branches:
refs/heads/master 40ffc3b34 -> c119db503
app catalog changes
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c119db50
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c119db50
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c119db50
Branch: refs/heads/master
Commit: c119db50381f1bc16c94d2f74c53faa1b3983357
Parents: 40ffc3b
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Fri Sep 25 11:18:18 2015 -0400
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Fri Sep 25 11:18:18 2015 -0400
----------------------------------------------------------------------
.../registry/core/app/catalog/model/BatchQueue.java | 13 +------------
.../core/app/catalog/model/CloudJobSubmission.java | 8 ++++----
.../core/app/catalog/model/ComputeResource.java | 3 ---
.../app/catalog/model/ComputeResourceFileSystem.java | 2 --
.../registry/core/app/catalog/model/Configuration.java | 3 ---
.../core/app/catalog/model/DataMovementInterface.java | 3 ---
.../core/app/catalog/model/GridftpDataMovement.java | 3 ---
.../core/app/catalog/model/GridftpEndpoint.java | 3 ---
.../core/app/catalog/model/JobManagerCommand.java | 3 ---
.../core/app/catalog/model/JobSubmissionInterface.java | 3 ---
.../core/app/catalog/model/LocalDataMovement.java | 3 ---
.../core/app/catalog/model/LocalSubmission.java | 3 ---
.../registry/core/app/catalog/model/ModuleLoadCmd.java | 3 ---
.../core/app/catalog/model/ResourceJobManager.java | 3 ---
.../core/app/catalog/model/ScpDataMovement.java | 3 ---
.../core/app/catalog/model/SshJobSubmission.java | 3 ---
.../registry/core/app/catalog/model/Workflow.java | 2 --
.../core/app/catalog/util/AppCatalogJPAUtils.java | 5 +++--
18 files changed, 8 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/c119db50/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/BatchQueue.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/BatchQueue.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/BatchQueue.java
index 4eb79dc..76dd452 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/BatchQueue.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/BatchQueue.java
@@ -21,20 +21,9 @@
package org.apache.airavata.registry.core.app.catalog.model;
+import javax.persistence.*;
import java.io.Serializable;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-import org.apache.openjpa.persistence.DataCache;
-
-@DataCache
@Entity
@Table(name = "BATCH_QUEUE")
@IdClass(BatchQueue_PK.class)
http://git-wip-us.apache.org/repos/asf/airavata/blob/c119db50/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/CloudJobSubmission.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/CloudJobSubmission.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/CloudJobSubmission.java
index 1bd6554..d7c7557 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/CloudJobSubmission.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/CloudJobSubmission.java
@@ -20,12 +20,12 @@
*/
package org.apache.airavata.registry.core.app.catalog.model;
-import org.apache.openjpa.persistence.DataCache;
-
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
import java.io.Serializable;
-@DataCache
@Entity
@Table(name = "CLOUD_JOB_SUBMISSION")
public class CloudJobSubmission implements Serializable {
http://git-wip-us.apache.org/repos/asf/airavata/blob/c119db50/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ComputeResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ComputeResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ComputeResource.java
index faf15f7..4396f68 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ComputeResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ComputeResource.java
@@ -21,8 +21,6 @@
package org.apache.airavata.registry.core.app.catalog.model;
-import org.apache.openjpa.persistence.DataCache;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
@@ -30,7 +28,6 @@ import javax.persistence.Table;
import java.io.Serializable;
import java.sql.Timestamp;
-@DataCache
@Entity
@Table(name = "COMPUTE_RESOURCE")
public class ComputeResource implements Serializable {
http://git-wip-us.apache.org/repos/asf/airavata/blob/c119db50/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ComputeResourceFileSystem.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ComputeResourceFileSystem.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ComputeResourceFileSystem.java
index 79f36c6..fb6df86 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ComputeResourceFileSystem.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ComputeResourceFileSystem.java
@@ -32,9 +32,7 @@ import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
-import org.apache.openjpa.persistence.DataCache;
-@DataCache
@Entity
@Table(name = "COMPUTE_RESOURCE_FILE_SYSTEM")
@IdClass(ComputeResourceFileSystem_PK.class)
http://git-wip-us.apache.org/repos/asf/airavata/blob/c119db50/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/Configuration.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/Configuration.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/Configuration.java
index 2768e91..cd5ff6f 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/Configuration.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/Configuration.java
@@ -20,12 +20,9 @@
*/
package org.apache.airavata.registry.core.app.catalog.model;
-import org.apache.openjpa.persistence.DataCache;
-
import javax.persistence.*;
import java.io.Serializable;
-@DataCache
@Entity
@Table(name ="CONFIGURATION")
@IdClass(Configuration_PK.class)
http://git-wip-us.apache.org/repos/asf/airavata/blob/c119db50/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataMovementInterface.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataMovementInterface.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataMovementInterface.java
index d95dfa0..61e625d 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataMovementInterface.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataMovementInterface.java
@@ -33,9 +33,6 @@ import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
-import org.apache.openjpa.persistence.DataCache;
-
-@DataCache
@Entity
@Table(name = "DATA_MOVEMENT_INTERFACE")
@IdClass(DataMovementInterface_PK.class)
http://git-wip-us.apache.org/repos/asf/airavata/blob/c119db50/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/GridftpDataMovement.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/GridftpDataMovement.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/GridftpDataMovement.java
index 91f0cd1..200a0ca 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/GridftpDataMovement.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/GridftpDataMovement.java
@@ -29,9 +29,6 @@ import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
-import org.apache.openjpa.persistence.DataCache;
-
-@DataCache
@Entity
@Table(name = "GRIDFTP_DATA_MOVEMENT")
public class GridftpDataMovement implements Serializable {
http://git-wip-us.apache.org/repos/asf/airavata/blob/c119db50/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/GridftpEndpoint.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/GridftpEndpoint.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/GridftpEndpoint.java
index 71e2379..ec7bbb8 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/GridftpEndpoint.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/GridftpEndpoint.java
@@ -33,9 +33,6 @@ import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
-import org.apache.openjpa.persistence.DataCache;
-
-@DataCache
@Entity
@Table(name = "GRIDFTP_ENDPOINT")
@IdClass(GridftpEndpoint_PK.class)
http://git-wip-us.apache.org/repos/asf/airavata/blob/c119db50/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/JobManagerCommand.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/JobManagerCommand.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/JobManagerCommand.java
index a65e5e3..883f5d0 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/JobManagerCommand.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/JobManagerCommand.java
@@ -32,9 +32,6 @@ import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
-import org.apache.openjpa.persistence.DataCache;
-
-@DataCache
@Entity
@Table(name = "JOB_MANAGER_COMMAND")
@IdClass(JobManagerCommand_PK.class)
http://git-wip-us.apache.org/repos/asf/airavata/blob/c119db50/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/JobSubmissionInterface.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/JobSubmissionInterface.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/JobSubmissionInterface.java
index 314de5b..e062ec5 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/JobSubmissionInterface.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/JobSubmissionInterface.java
@@ -33,9 +33,6 @@ import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
-import org.apache.openjpa.persistence.DataCache;
-
-@DataCache
@Entity
@Table(name = "JOB_SUBMISSION_INTERFACE")
@IdClass(JobSubmissionInterface_PK.class)
http://git-wip-us.apache.org/repos/asf/airavata/blob/c119db50/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/LocalDataMovement.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/LocalDataMovement.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/LocalDataMovement.java
index 8068faa..19e86b3 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/LocalDataMovement.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/LocalDataMovement.java
@@ -28,9 +28,6 @@ import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
-import org.apache.openjpa.persistence.DataCache;
-
-@DataCache
@Entity
@Table(name = "LOCAL_DATA_MOVEMENT")
public class LocalDataMovement implements Serializable {
http://git-wip-us.apache.org/repos/asf/airavata/blob/c119db50/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/LocalSubmission.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/LocalSubmission.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/LocalSubmission.java
index 02c3edf..c66e2e8 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/LocalSubmission.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/LocalSubmission.java
@@ -32,9 +32,6 @@ import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
-import org.apache.openjpa.persistence.DataCache;
-
-@DataCache
@Entity
@Table(name = "LOCAL_SUBMISSION")
public class LocalSubmission implements Serializable {
http://git-wip-us.apache.org/repos/asf/airavata/blob/c119db50/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 dadf462..f8f9534 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
@@ -21,12 +21,9 @@
package org.apache.airavata.registry.core.app.catalog.model;
-import org.apache.openjpa.persistence.DataCache;
-
import javax.persistence.*;
import java.io.Serializable;
-@DataCache
@Entity
@Table(name = "MODULE_LOAD_CMD")
@IdClass(ModuleLoadCmd_PK.class)
http://git-wip-us.apache.org/repos/asf/airavata/blob/c119db50/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ResourceJobManager.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ResourceJobManager.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ResourceJobManager.java
index ad63caa..8e4fa60 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ResourceJobManager.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ResourceJobManager.java
@@ -29,9 +29,6 @@ import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
-import org.apache.openjpa.persistence.DataCache;
-
-@DataCache
@Entity
@Table(name = "RESOURCE_JOB_MANAGER")
public class ResourceJobManager implements Serializable {
http://git-wip-us.apache.org/repos/asf/airavata/blob/c119db50/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ScpDataMovement.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ScpDataMovement.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ScpDataMovement.java
index a12b120..34d3af2 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ScpDataMovement.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ScpDataMovement.java
@@ -29,9 +29,6 @@ import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
-import org.apache.openjpa.persistence.DataCache;
-
-@DataCache
@Entity
@Table(name = "SCP_DATA_MOVEMENT")
public class ScpDataMovement implements Serializable {
http://git-wip-us.apache.org/repos/asf/airavata/blob/c119db50/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/SshJobSubmission.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/SshJobSubmission.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/SshJobSubmission.java
index 30e46f4..a79fee7 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/SshJobSubmission.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/SshJobSubmission.java
@@ -32,9 +32,6 @@ import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
-import org.apache.openjpa.persistence.DataCache;
-
-@DataCache
@Entity
@Table(name = "SSH_JOB_SUBMISSION")
public class SshJobSubmission implements Serializable {
http://git-wip-us.apache.org/repos/asf/airavata/blob/c119db50/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/Workflow.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/Workflow.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/Workflow.java
index 6520fd2..27cb18c 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/Workflow.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/Workflow.java
@@ -21,13 +21,11 @@
package org.apache.airavata.registry.core.app.catalog.model;
-import org.apache.openjpa.persistence.DataCache;
import javax.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
-@DataCache
@Entity
@Table(name = "WORKFLOW")
public class Workflow implements Serializable {
http://git-wip-us.apache.org/repos/asf/airavata/blob/c119db50/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
index 4c5489b..4ef21bd 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
@@ -60,8 +60,9 @@ public class AppCatalogJPAUtils {
properties.put("openjpa.ConnectionProperties", connectionProperties);
properties.put("openjpa.DynamicEnhancementAgent", "true");
properties.put("openjpa.RuntimeUnenhancedClasses", "unsupported");
- properties.put("openjpa.DataCache","" + readServerProperties(JPA_CACHE_ENABLED) + "(CacheSize=" + Integer.valueOf(readServerProperties(JPA_CACHE_SIZE)) + ", SoftReferenceSize=0)");
- properties.put("openjpa.QueryCache","" + readServerProperties(JPA_CACHE_ENABLED) + "(CacheSize=" + Integer.valueOf(readServerProperties(JPA_CACHE_SIZE)) + ", SoftReferenceSize=0)");
+ // For app catalog, we don't need caching
+// properties.put("openjpa.DataCache","" + readServerProperties(JPA_CACHE_ENABLED) + "(CacheSize=" + Integer.valueOf(readServerProperties(JPA_CACHE_SIZE)) + ", SoftReferenceSize=0)");
+// properties.put("openjpa.QueryCache","" + readServerProperties(JPA_CACHE_ENABLED) + "(CacheSize=" + Integer.valueOf(readServerProperties(JPA_CACHE_SIZE)) + ", SoftReferenceSize=0)");
properties.put("openjpa.RemoteCommitProvider","sjvm");
properties.put("openjpa.Log","DefaultLevel=INFO, Runtime=INFO, Tool=INFO, SQL=INFO");
properties.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=true)");