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 2016/11/02 18:11:00 UTC

[2/6] airavata git commit: App Catalog and Compute Resource Entities

App Catalog and Compute Resource Entities


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

Branch: refs/heads/registry-refactoring
Commit: 3a748bdc971fa3a417d26d7d5ea54d0bafcd5aba
Parents: d8cd7ba
Author: Abhiit Karanjkar <ay...@indiana.edu>
Authored: Thu Oct 13 06:14:19 2016 -0400
Committer: Abhiit Karanjkar <ay...@indiana.edu>
Committed: Thu Oct 13 06:14:19 2016 -0400

----------------------------------------------------------------------
 .../appcatalog/AppEnvironmentEntity.java        |  50 ++++++
 .../appcatalog/AppModuleMappingEntity.java      |  29 ++++
 .../entities/appcatalog/AppModuleMappingPK.java |  57 +++++++
 .../appcatalog/ApplicationDeploymentEntity.java | 129 ++++++++++++++
 .../appcatalog/ApplicationInputEntity.java      | 138 +++++++++++++++
 .../entities/appcatalog/ApplicationInputPK.java |  57 +++++++
 .../appcatalog/ApplicationInterfaceEntity.java  |  99 +++++++++++
 .../appcatalog/ApplicationModuleEntity.java     |  98 +++++++++++
 .../appcatalog/ApplicationOutputEntity.java     | 126 ++++++++++++++
 .../appcatalog/ApplicationOutputPK.java         |  57 +++++++
 .../entities/appcatalog/BatchQueueEntity.java   |  93 ++++++++++
 .../core/entities/appcatalog/BatchQueuePK.java  |  57 +++++++
 .../appcatalog/ComputeResourceEntity.java       | 128 ++++++++++++++
 .../ComputeResourceFileSystemEntity.java        |  42 +++++
 .../appcatalog/ComputeResourceFileSystemPK.java |  57 +++++++
 .../ComputeResourcePreferenceEntity.java        | 171 +++++++++++++++++++
 .../appcatalog/ComputeResourcePreferencePK.java |  57 +++++++
 .../appcatalog/DataMovementInterfaceEntity.java |  72 ++++++++
 .../appcatalog/DataMovementInterfacePK.java     |  57 +++++++
 .../appcatalog/DataStoragePreferenceEntity.java |  60 +++++++
 .../appcatalog/DataStoragePreferencePK.java     |  57 +++++++
 .../appcatalog/GatewayProfileEntity.java        |  87 ++++++++++
 .../appcatalog/GlobusGkEndpointEntity.java      |  31 ++++
 .../entities/appcatalog/GlobusGkEndpointPK.java |  57 +++++++
 .../appcatalog/GlobusSubmissionEntity.java      |  52 ++++++
 .../appcatalog/GridftpDataMovementEntity.java   |  65 +++++++
 .../appcatalog/GridftpEndpointEntity.java       |  52 ++++++
 .../entities/appcatalog/GridftpEndpointPK.java  |  56 ++++++
 .../entities/appcatalog/GsisshExportEntity.java |  28 +++
 .../entities/appcatalog/GsisshExportPK.java     |  57 +++++++
 .../appcatalog/GsisshPostjobcommandEntity.java  |  28 +++
 .../appcatalog/GsisshPostjobcommandPK.java      |  59 +++++++
 .../appcatalog/GsisshPrejobcommandEntity.java   |  29 ++++
 .../appcatalog/GsisshPrejobcommandPK.java       |  57 +++++++
 .../appcatalog/GsisshSubmissionEntity.java      |  74 ++++++++
 .../entities/appcatalog/HostAliasEntity.java    |  39 +++++
 .../core/entities/appcatalog/HostAliasPK.java   |  60 +++++++
 .../appcatalog/HostIpaddressEntity.java         |  40 +++++
 .../entities/appcatalog/HostIpaddressPK.java    |  57 +++++++
 .../appcatalog/JobManagerCommandEntity.java     |  39 +++++
 .../appcatalog/JobManagerCommandPK.java         |  57 +++++++
 .../JobSubmissionInterfaceEntity.java           |  73 ++++++++
 .../appcatalog/JobSubmissionInterfacePK.java    |  57 +++++++
 .../appcatalog/LibraryApendPathEntity.java      |  52 ++++++
 .../appcatalog/LibraryPrependPathEntity.java    |  54 ++++++
 .../appcatalog/LocalDataMovementEntity.java     |  29 ++++
 .../appcatalog/LocalSubmissionEntity.java       |  62 +++++++
 .../appcatalog/ParallelismCommandEntity.java    |  38 +++++
 .../appcatalog/ParallelismCommandPK.java        |  57 +++++++
 .../appcatalog/PostjobCommandEntity.java        |  29 ++++
 .../entities/appcatalog/PostjobCommandPK.java   |  59 +++++++
 .../appcatalog/PrejobCommandEntity.java         |  30 ++++
 .../entities/appcatalog/PrejobCommandPK.java    |  56 ++++++
 .../appcatalog/ResourceJobManagerEntity.java    |  85 +++++++++
 .../appcatalog/ScpDataMovementEntity.java       |  96 +++++++++++
 .../appcatalog/SshJobSubmissionEntity.java      | 108 ++++++++++++
 .../appcatalog/StorageInterfaceEntity.java      |  73 ++++++++
 .../entities/appcatalog/StorageInterfacePK.java |  57 +++++++
 .../appcatalog/StorageResourceEntity.java       |  83 +++++++++
 .../appcatalog/UnicoreDatamovementEntity.java   |  52 ++++++
 .../appcatalog/UnicoreSubmissionEntity.java     |  52 ++++++
 61 files changed, 3917 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppEnvironmentEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppEnvironmentEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppEnvironmentEntity.java
new file mode 100644
index 0000000..a4e141e
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppEnvironmentEntity.java
@@ -0,0 +1,50 @@
+package org.apache.airavata.registry.core.entities.appcatalog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+
+/**
+ * The persistent class for the app_environment database table.
+ */
+@Entity
+@Table(name = "app_environment")
+public class AppEnvironment implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @Column(name = "DEPLOYMENT_ID")
+    private String deploymentId;
+
+    @Column(name = "value")
+    private String value;
+
+    @Column(name = "name")
+    private String name;
+
+    public AppEnvironment() {
+    }
+
+    public String getDeploymentId() {
+        return deploymentId;
+    }
+
+    public void setDeploymentId(String deploymentId) {
+        this.deploymentId = deploymentId;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppModuleMappingEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppModuleMappingEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppModuleMappingEntity.java
new file mode 100644
index 0000000..d539408
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppModuleMappingEntity.java
@@ -0,0 +1,29 @@
+package org.apache.airavata.registry.core.entities.appcatalog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+
+
+/**
+ * The persistent class for the app_module_mapping database table.
+ * 
+ */
+@Entity
+@Table(name="app_module_mapping")
+public class AppModuleMapping implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	@EmbeddedId
+	private AppModuleMappingPK id;
+
+	public AppModuleMapping() {
+	}
+
+	public AppModuleMappingPK getId() {
+		return id;
+	}
+
+	public void setId(AppModuleMappingPK id) {
+		this.id = id;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppModuleMappingPK.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppModuleMappingPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppModuleMappingPK.java
new file mode 100644
index 0000000..2890f14
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppModuleMappingPK.java
@@ -0,0 +1,57 @@
+package appcatlog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+
+/**
+ * The primary key class for the app_module_mapping database table.
+ * 
+ */
+@Embeddable
+public class AppModuleMappingPK implements Serializable {
+	//default serial version id, required for serializable classes.
+	private static final long serialVersionUID = 1L;
+
+	@Column(name="INTERFACE_ID", insertable=false, updatable=false)
+	private String interfaceId;
+
+	@Column(name="MODULE_ID", insertable=false, updatable=false)
+	private String moduleId;
+
+	public AppModuleMappingPK() {
+	}
+	public String getInterfaceId() {
+		return this.interfaceId;
+	}
+	public void setInterfaceId(String interfaceId) {
+		this.interfaceId = interfaceId;
+	}
+	public String getModuleId() {
+		return this.moduleId;
+	}
+	public void setModuleId(String moduleId) {
+		this.moduleId = moduleId;
+	}
+
+	public boolean equals(Object other) {
+		if (this == other) {
+			return true;
+		}
+		if (!(other instanceof AppModuleMappingPK)) {
+			return false;
+		}
+		AppModuleMappingPK castOther = (AppModuleMappingPK)other;
+		return 
+			this.interfaceId.equals(castOther.interfaceId)
+			&& this.moduleId.equals(castOther.moduleId);
+	}
+
+	public int hashCode() {
+		final int prime = 31;
+		int hash = 17;
+		hash = hash * prime + this.interfaceId.hashCode();
+		hash = hash * prime + this.moduleId.hashCode();
+		
+		return hash;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationDeploymentEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationDeploymentEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationDeploymentEntity.java
new file mode 100644
index 0000000..a7132a0
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationDeploymentEntity.java
@@ -0,0 +1,129 @@
+package org.apache.airavata.registry.core.entities.appcatalog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+import java.sql.Timestamp;
+import java.util.List;
+
+/**
+ * The persistent class for the application_deployment database table.
+ */
+@Entity
+@Table(name = "application_deployment")
+public class ApplicationDeployment implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @Column(name = "DEPLOYMENT_ID")
+    private String deploymentId;
+
+    @Column(name = "APPLICATION_DESC")
+    private String applicationDesc;
+
+    @Column(name = "CREATION_TIME")
+    private Timestamp creationTime;
+
+    @Column(name = "ENV_MODULE_LOAD_CMD")
+    private String envModuleLoadCmd;
+
+    @Column(name = "EXECUTABLE_PATH")
+    private String executablePath;
+
+    @Column(name = "GATEWAY_ID")
+    private String gatewayId;
+
+    @Column(name = "parallelism")
+    private String parallelism;
+
+    @Column(name = "UPDATE_TIME")
+    private Timestamp updateTime;
+
+    @Column(name = "COMPUTE_HOSTID")
+    private String computeHostid;
+
+    @Column(name = "APP_MODULE_ID")
+    private String applicationModuleId;
+
+    public ApplicationDeployment() {
+    }
+
+    public String getDeploymentId() {
+        return deploymentId;
+    }
+
+    public void setDeploymentId(String deploymentId) {
+        this.deploymentId = deploymentId;
+    }
+
+    public String getApplicationDesc() {
+        return applicationDesc;
+    }
+
+    public void setApplicationDesc(String applicationDesc) {
+        this.applicationDesc = applicationDesc;
+    }
+
+    public Timestamp getCreationTime() {
+        return creationTime;
+    }
+
+    public void setCreationTime(Timestamp creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    public String getEnvModuleLoadCmd() {
+        return envModuleLoadCmd;
+    }
+
+    public void setEnvModuleLoadCmd(String envModuleLoadCmd) {
+        this.envModuleLoadCmd = envModuleLoadCmd;
+    }
+
+    public String getExecutablePath() {
+        return executablePath;
+    }
+
+    public void setExecutablePath(String executablePath) {
+        this.executablePath = executablePath;
+    }
+
+    public String getGatewayId() {
+        return gatewayId;
+    }
+
+    public void setGatewayId(String gatewayId) {
+        this.gatewayId = gatewayId;
+    }
+
+    public String getParallelism() {
+        return parallelism;
+    }
+
+    public void setParallelism(String parallelism) {
+        this.parallelism = parallelism;
+    }
+
+    public Timestamp getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Timestamp updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getComputeHostid() {
+        return computeHostid;
+    }
+
+    public void setComputeHostid(String computeHostid) {
+        this.computeHostid = computeHostid;
+    }
+
+    public String getApplicationModuleId() {
+        return applicationModuleId;
+    }
+
+    public void setApplicationModuleId(String applicationModuleId) {
+        this.applicationModuleId = applicationModuleId;
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputEntity.java
new file mode 100644
index 0000000..a3a827e
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputEntity.java
@@ -0,0 +1,138 @@
+package org.apache.airavata.registry.core.entities.appcatalog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+
+/**
+ * The persistent class for the application_input database table.
+ * 
+ */
+@Entity
+@Table(name = "application_input")
+public class ApplicationInput implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	@EmbeddedId
+	private ApplicationInputPK id;
+
+	@Column(name = "APP_ARGUMENT")
+	private String appArgument;
+
+	@Column(name = "DATA_STAGED")
+	private short dataStaged;
+
+	@Column(name = "DATA_TYPE")
+	private String dataType;
+
+	@Column(name = "INPUT_ORDER")
+	private int inputOrder;
+
+	@Column(name = "INPUT_VALUE")
+	private String inputValue;
+
+	@Column(name = "IS_REQUIRED")
+	private short isRequired;
+
+	@Column(name = "METADATA")
+	private String metadata;
+
+	@Column(name = "REQUIRED_TO_COMMANDLINE")
+	private short requiredToCommandline;
+
+	@Column(name = "STANDARD_INPUT")
+	private short standardInput;
+
+	@Column(name = "USER_FRIENDLY_DESC")
+	private String userFriendlyDesc;
+
+	public ApplicationInput() {
+	}
+
+	public ApplicationInputPK getId() {
+		return id;
+	}
+
+	public void setId(ApplicationInputPK id) {
+		this.id = id;
+	}
+
+	public String getAppArgument() {
+		return appArgument;
+	}
+
+	public void setAppArgument(String appArgument) {
+		this.appArgument = appArgument;
+	}
+
+	public short getDataStaged() {
+		return dataStaged;
+	}
+
+	public void setDataStaged(short dataStaged) {
+		this.dataStaged = dataStaged;
+	}
+
+	public String getDataType() {
+		return dataType;
+	}
+
+	public void setDataType(String dataType) {
+		this.dataType = dataType;
+	}
+
+	public int getInputOrder() {
+		return inputOrder;
+	}
+
+	public void setInputOrder(int inputOrder) {
+		this.inputOrder = inputOrder;
+	}
+
+	public String getInputValue() {
+		return inputValue;
+	}
+
+	public void setInputValue(String inputValue) {
+		this.inputValue = inputValue;
+	}
+
+	public short getIsRequired() {
+		return isRequired;
+	}
+
+	public void setIsRequired(short isRequired) {
+		this.isRequired = isRequired;
+	}
+
+	public String getMetadata() {
+		return metadata;
+	}
+
+	public void setMetadata(String metadata) {
+		this.metadata = metadata;
+	}
+
+	public short getRequiredToCommandline() {
+		return requiredToCommandline;
+	}
+
+	public void setRequiredToCommandline(short requiredToCommandline) {
+		this.requiredToCommandline = requiredToCommandline;
+	}
+
+	public short getStandardInput() {
+		return standardInput;
+	}
+
+	public void setStandardInput(short standardInput) {
+		this.standardInput = standardInput;
+	}
+
+	public String getUserFriendlyDesc() {
+		return userFriendlyDesc;
+	}
+
+	public void setUserFriendlyDesc(String userFriendlyDesc) {
+		this.userFriendlyDesc = userFriendlyDesc;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputPK.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputPK.java
new file mode 100644
index 0000000..ad8b44f
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputPK.java
@@ -0,0 +1,57 @@
+package appcatlog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+
+/**
+ * The primary key class for the application_input database table.
+ * 
+ */
+@Embeddable
+public class ApplicationInputPK implements Serializable {
+	//default serial version id, required for serializable classes.
+	private static final long serialVersionUID = 1L;
+
+	@Column(name="INTERFACE_ID", insertable=false, updatable=false)
+	private String interfaceId;
+
+	@Column(name="INPUT_KEY")
+	private String inputKey;
+
+	public ApplicationInputPK() {
+	}
+	public String getInterfaceId() {
+		return this.interfaceId;
+	}
+	public void setInterfaceId(String interfaceId) {
+		this.interfaceId = interfaceId;
+	}
+	public String getInputKey() {
+		return this.inputKey;
+	}
+	public void setInputKey(String inputKey) {
+		this.inputKey = inputKey;
+	}
+
+	public boolean equals(Object other) {
+		if (this == other) {
+			return true;
+		}
+		if (!(other instanceof ApplicationInputPK)) {
+			return false;
+		}
+		ApplicationInputPK castOther = (ApplicationInputPK)other;
+		return 
+			this.interfaceId.equals(castOther.interfaceId)
+			&& this.inputKey.equals(castOther.inputKey);
+	}
+
+	public int hashCode() {
+		final int prime = 31;
+		int hash = 17;
+		hash = hash * prime + this.interfaceId.hashCode();
+		hash = hash * prime + this.inputKey.hashCode();
+		
+		return hash;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInterfaceEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInterfaceEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInterfaceEntity.java
new file mode 100644
index 0000000..9c068fa
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInterfaceEntity.java
@@ -0,0 +1,99 @@
+package org.apache.airavata.registry.core.entities.appcatalog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+import java.sql.Timestamp;
+import java.util.List;
+
+
+/**
+ * The persistent class for the application_interface database table.
+ * 
+ */
+@Entity
+@Table(name="application_interface")
+public class ApplicationInterface implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@Column(name="INTERFACE_ID")
+	private String interfaceId;
+
+	@Column(name="APPLICATION_DESCRIPTION")
+	private String applicationDescription;
+
+	@Column(name="APPLICATION_NAME")
+	private String applicationName;
+
+	@Column(name="ARCHIVE_WORKING_DIRECTORY")
+	private short archiveWorkingDirectory;
+
+	@Column(name="CREATION_TIME")
+	private Timestamp creationTime;
+
+	@Column(name="GATEWAY_ID")
+	private String gatewayId;
+
+	@Column(name="UPDATE_TIME")
+	private Timestamp updateTime;
+
+	
+	public ApplicationInterface() {
+	}
+
+	public String getInterfaceId() {
+		return interfaceId;
+	}
+
+	public void setInterfaceId(String interfaceId) {
+		this.interfaceId = interfaceId;
+	}
+
+	public String getApplicationDescription() {
+		return applicationDescription;
+	}
+
+	public void setApplicationDescription(String applicationDescription) {
+		this.applicationDescription = applicationDescription;
+	}
+
+	public String getApplicationName() {
+		return applicationName;
+	}
+
+	public void setApplicationName(String applicationName) {
+		this.applicationName = applicationName;
+	}
+
+	public short getArchiveWorkingDirectory() {
+		return archiveWorkingDirectory;
+	}
+
+	public void setArchiveWorkingDirectory(short archiveWorkingDirectory) {
+		this.archiveWorkingDirectory = archiveWorkingDirectory;
+	}
+
+	public Timestamp getCreationTime() {
+		return creationTime;
+	}
+
+	public void setCreationTime(Timestamp creationTime) {
+		this.creationTime = creationTime;
+	}
+
+	public String getGatewayId() {
+		return gatewayId;
+	}
+
+	public void setGatewayId(String gatewayId) {
+		this.gatewayId = gatewayId;
+	}
+
+	public Timestamp getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Timestamp updateTime) {
+		this.updateTime = updateTime;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationModuleEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationModuleEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationModuleEntity.java
new file mode 100644
index 0000000..362bffb
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationModuleEntity.java
@@ -0,0 +1,98 @@
+package org.apache.airavata.registry.core.entities.appcatalog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+import java.sql.Timestamp;
+import java.util.List;
+
+/**
+ * The persistent class for the application_module database table.
+ * 
+ */
+@Entity
+@Table(name = "application_module")
+@NamedQuery(name = "ApplicationModule.findAll", query = "SELECT a FROM ApplicationModule a")
+public class ApplicationModule implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@Column(name = "MODULE_ID")
+	private String moduleId;
+
+	@Column(name = "CREATION_TIME")
+	private Timestamp creationTime;
+
+	@Column(name = "GATEWAY_ID")
+	private String gatewayId;
+
+	@Column(name = "MODULE_DESC")
+	private String moduleDesc;
+
+	@Column(name = "MODULE_NAME")
+	private String moduleName;
+
+	@Column(name = "MODULE_VERSION")
+	private String moduleVersion;
+
+	@Column(name = "UPDATE_TIME")
+	private Timestamp updateTime;
+
+	public ApplicationModule() {
+	}
+
+	public String getModuleId() {
+		return moduleId;
+	}
+
+	public void setModuleId(String moduleId) {
+		this.moduleId = moduleId;
+	}
+
+	public Timestamp getCreationTime() {
+		return creationTime;
+	}
+
+	public void setCreationTime(Timestamp creationTime) {
+		this.creationTime = creationTime;
+	}
+
+	public String getGatewayId() {
+		return gatewayId;
+	}
+
+	public void setGatewayId(String gatewayId) {
+		this.gatewayId = gatewayId;
+	}
+
+	public String getModuleDesc() {
+		return moduleDesc;
+	}
+
+	public void setModuleDesc(String moduleDesc) {
+		this.moduleDesc = moduleDesc;
+	}
+
+	public String getModuleName() {
+		return moduleName;
+	}
+
+	public void setModuleName(String moduleName) {
+		this.moduleName = moduleName;
+	}
+
+	public String getModuleVersion() {
+		return moduleVersion;
+	}
+
+	public void setModuleVersion(String moduleVersion) {
+		this.moduleVersion = moduleVersion;
+	}
+
+	public Timestamp getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Timestamp updateTime) {
+		this.updateTime = updateTime;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputEntity.java
new file mode 100644
index 0000000..497a70a
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputEntity.java
@@ -0,0 +1,126 @@
+package org.apache.airavata.registry.core.entities.appcatalog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+
+/**
+ * The persistent class for the application_output database table.
+ */
+@Entity
+@Table(name = "application_output")
+public class ApplicationOutput implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @EmbeddedId
+    private ApplicationOutputPK id;
+
+    @Column(name = "APP_ARGUMENT")
+    private String appArgument;
+
+    @Column(name = "DATA_MOVEMENT")
+    private short dataMovement;
+
+    @Column(name = "DATA_NAME_LOCATION")
+    private String dataNameLocation;
+
+    @Column(name = "DATA_TYPE")
+    private String dataType;
+
+    @Column(name = "IS_REQUIRED")
+    private short isRequired;
+
+    @Column(name = "OUTPUT_STREAMING")
+    private short outputStreaming;
+
+    @Column(name = "OUTPUT_VALUE")
+    private String outputValue;
+
+    @Column(name = "REQUIRED_TO_COMMANDLINE")
+    private short requiredToCommandline;
+
+    @Column(name = "SEARCH_QUERY")
+    private String searchQuery;
+
+    public ApplicationOutput() {
+    }
+
+    public ApplicationOutputPK getId() {
+        return id;
+    }
+
+    public void setId(ApplicationOutputPK id) {
+        this.id = id;
+    }
+
+    public String getAppArgument() {
+        return appArgument;
+    }
+
+    public void setAppArgument(String appArgument) {
+        this.appArgument = appArgument;
+    }
+
+    public short getDataMovement() {
+        return dataMovement;
+    }
+
+    public void setDataMovement(short dataMovement) {
+        this.dataMovement = dataMovement;
+    }
+
+    public String getDataNameLocation() {
+        return dataNameLocation;
+    }
+
+    public void setDataNameLocation(String dataNameLocation) {
+        this.dataNameLocation = dataNameLocation;
+    }
+
+    public String getDataType() {
+        return dataType;
+    }
+
+    public void setDataType(String dataType) {
+        this.dataType = dataType;
+    }
+
+    public short getIsRequired() {
+        return isRequired;
+    }
+
+    public void setIsRequired(short isRequired) {
+        this.isRequired = isRequired;
+    }
+
+    public short getOutputStreaming() {
+        return outputStreaming;
+    }
+
+    public void setOutputStreaming(short outputStreaming) {
+        this.outputStreaming = outputStreaming;
+    }
+
+    public String getOutputValue() {
+        return outputValue;
+    }
+
+    public void setOutputValue(String outputValue) {
+        this.outputValue = outputValue;
+    }
+
+    public short getRequiredToCommandline() {
+        return requiredToCommandline;
+    }
+
+    public void setRequiredToCommandline(short requiredToCommandline) {
+        this.requiredToCommandline = requiredToCommandline;
+    }
+
+    public String getSearchQuery() {
+        return searchQuery;
+    }
+
+    public void setSearchQuery(String searchQuery) {
+        this.searchQuery = searchQuery;
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputPK.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputPK.java
new file mode 100644
index 0000000..564bf81
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputPK.java
@@ -0,0 +1,57 @@
+package appcatlog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+
+/**
+ * The primary key class for the application_output database table.
+ * 
+ */
+@Embeddable
+public class ApplicationOutputPK implements Serializable {
+	//default serial version id, required for serializable classes.
+	private static final long serialVersionUID = 1L;
+
+	@Column(name="INTERFACE_ID", insertable=false, updatable=false)
+	private String interfaceId;
+
+	@Column(name="OUTPUT_KEY")
+	private String outputKey;
+
+	public ApplicationOutputPK() {
+	}
+	public String getInterfaceId() {
+		return this.interfaceId;
+	}
+	public void setInterfaceId(String interfaceId) {
+		this.interfaceId = interfaceId;
+	}
+	public String getOutputKey() {
+		return this.outputKey;
+	}
+	public void setOutputKey(String outputKey) {
+		this.outputKey = outputKey;
+	}
+
+	public boolean equals(Object other) {
+		if (this == other) {
+			return true;
+		}
+		if (!(other instanceof ApplicationOutputPK)) {
+			return false;
+		}
+		ApplicationOutputPK castOther = (ApplicationOutputPK)other;
+		return 
+			this.interfaceId.equals(castOther.interfaceId)
+			&& this.outputKey.equals(castOther.outputKey);
+	}
+
+	public int hashCode() {
+		final int prime = 31;
+		int hash = 17;
+		hash = hash * prime + this.interfaceId.hashCode();
+		hash = hash * prime + this.outputKey.hashCode();
+		
+		return hash;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueueEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueueEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueueEntity.java
new file mode 100644
index 0000000..a1fb6d9
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueueEntity.java
@@ -0,0 +1,93 @@
+package org.apache.airavata.registry.core.entities.appcatalog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+
+/**
+ * The persistent class for the batch_queue database table.
+ */
+@Entity
+@Table(name = "batch_queue")
+public class BatchQueue implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @EmbeddedId
+    private BatchQueuePK id;
+
+    @Column(name = "MAX_JOB_IN_QUEUE")
+    private int maxJobInQueue;
+
+    @Column(name = "MAX_MEMORY")
+    private int maxMemory;
+
+    @Column(name = "MAX_NODES")
+    private int maxNodes;
+
+    @Column(name = "MAX_PROCESSORS")
+    private int maxProcessors;
+
+    @Column(name = "MAX_RUNTIME")
+    private int maxRuntime;
+
+    @Column(name = "QUEUE_DESCRIPTION")
+    private String queueDescription;
+
+    public BatchQueue() {
+    }
+
+    public BatchQueuePK getId() {
+        return id;
+    }
+
+    public void setId(BatchQueuePK id) {
+        this.id = id;
+    }
+
+    public int getMaxJobInQueue() {
+        return maxJobInQueue;
+    }
+
+    public void setMaxJobInQueue(int maxJobInQueue) {
+        this.maxJobInQueue = maxJobInQueue;
+    }
+
+    public int getMaxMemory() {
+        return maxMemory;
+    }
+
+    public void setMaxMemory(int maxMemory) {
+        this.maxMemory = maxMemory;
+    }
+
+    public int getMaxNodes() {
+        return maxNodes;
+    }
+
+    public void setMaxNodes(int maxNodes) {
+        this.maxNodes = maxNodes;
+    }
+
+    public int getMaxProcessors() {
+        return maxProcessors;
+    }
+
+    public void setMaxProcessors(int maxProcessors) {
+        this.maxProcessors = maxProcessors;
+    }
+
+    public int getMaxRuntime() {
+        return maxRuntime;
+    }
+
+    public void setMaxRuntime(int maxRuntime) {
+        this.maxRuntime = maxRuntime;
+    }
+
+    public String getQueueDescription() {
+        return queueDescription;
+    }
+
+    public void setQueueDescription(String queueDescription) {
+        this.queueDescription = queueDescription;
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueuePK.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueuePK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueuePK.java
new file mode 100644
index 0000000..decfa9e
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueuePK.java
@@ -0,0 +1,57 @@
+package appcatlog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+
+/**
+ * The primary key class for the batch_queue database table.
+ * 
+ */
+@Embeddable
+public class BatchQueuePK implements Serializable {
+	//default serial version id, required for serializable classes.
+	private static final long serialVersionUID = 1L;
+
+	@Column(name="COMPUTE_RESOURCE_ID", insertable=false, updatable=false)
+	private String computeResourceId;
+
+	@Column(name="QUEUE_NAME")
+	private String queueName;
+
+	public BatchQueuePK() {
+	}
+	public String getComputeResourceId() {
+		return this.computeResourceId;
+	}
+	public void setComputeResourceId(String computeResourceId) {
+		this.computeResourceId = computeResourceId;
+	}
+	public String getQueueName() {
+		return this.queueName;
+	}
+	public void setQueueName(String queueName) {
+		this.queueName = queueName;
+	}
+
+	public boolean equals(Object other) {
+		if (this == other) {
+			return true;
+		}
+		if (!(other instanceof BatchQueuePK)) {
+			return false;
+		}
+		BatchQueuePK castOther = (BatchQueuePK)other;
+		return 
+			this.computeResourceId.equals(castOther.computeResourceId)
+			&& this.queueName.equals(castOther.queueName);
+	}
+
+	public int hashCode() {
+		final int prime = 31;
+		int hash = 17;
+		hash = hash * prime + this.computeResourceId.hashCode();
+		hash = hash * prime + this.queueName.hashCode();
+		
+		return hash;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceEntity.java
new file mode 100644
index 0000000..9177607
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceEntity.java
@@ -0,0 +1,128 @@
+package org.apache.airavata.registry.core.entities.appcatalog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+import java.sql.Timestamp;
+import java.util.List;
+
+/**
+ * The persistent class for the compute_resource database table.
+ */
+@Entity
+@Table(name = "compute_resource")
+public class ComputeResource implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @Column(name = "RESOURCE_ID")
+    private String resourceId;
+
+    @Column(name = "CREATION_TIME")
+    private Timestamp creationTime;
+
+    private short enabled;
+
+    @Column(name = "GATEWAY_USAGE_EXECUTABLE")
+    private String gatewayUsageExecutable;
+
+    @Column(name = "GATEWAY_USAGE_MODULE_LOAD_CMD")
+    private String gatewayUsageModuleLoadCmd;
+
+    @Column(name = "GATEWAY_USAGE_REPORTING")
+    private short gatewayUsageReporting;
+
+    @Column(name = "HOST_NAME")
+    private String hostName;
+
+    @Column(name = "MAX_MEMORY_NODE")
+    private int maxMemoryNode;
+
+    @Column(name = "RESOURCE_DESCRIPTION")
+    private String resourceDescription;
+
+    @Column(name = "UPDATE_TIME")
+    private Timestamp updateTime;
+
+    public ComputeResource() {
+    }
+
+    public String getResourceId() {
+        return resourceId;
+    }
+
+    public void setResourceId(String resourceId) {
+        this.resourceId = resourceId;
+    }
+
+    public Timestamp getCreationTime() {
+        return creationTime;
+    }
+
+    public void setCreationTime(Timestamp creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    public short getEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(short enabled) {
+        this.enabled = enabled;
+    }
+
+    public String getGatewayUsageExecutable() {
+        return gatewayUsageExecutable;
+    }
+
+    public void setGatewayUsageExecutable(String gatewayUsageExecutable) {
+        this.gatewayUsageExecutable = gatewayUsageExecutable;
+    }
+
+    public String getGatewayUsageModuleLoadCmd() {
+        return gatewayUsageModuleLoadCmd;
+    }
+
+    public void setGatewayUsageModuleLoadCmd(String gatewayUsageModuleLoadCmd) {
+        this.gatewayUsageModuleLoadCmd = gatewayUsageModuleLoadCmd;
+    }
+
+    public short getGatewayUsageReporting() {
+        return gatewayUsageReporting;
+    }
+
+    public void setGatewayUsageReporting(short gatewayUsageReporting) {
+        this.gatewayUsageReporting = gatewayUsageReporting;
+    }
+
+    public String getHostName() {
+        return hostName;
+    }
+
+    public void setHostName(String hostName) {
+        this.hostName = hostName;
+    }
+
+    public int getMaxMemoryNode() {
+        return maxMemoryNode;
+    }
+
+    public void setMaxMemoryNode(int maxMemoryNode) {
+        this.maxMemoryNode = maxMemoryNode;
+    }
+
+    public String getResourceDescription() {
+        return resourceDescription;
+    }
+
+    public void setResourceDescription(String resourceDescription) {
+        this.resourceDescription = resourceDescription;
+    }
+
+    public Timestamp getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Timestamp updateTime) {
+        this.updateTime = updateTime;
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceFileSystemEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceFileSystemEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceFileSystemEntity.java
new file mode 100644
index 0000000..514ee86
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceFileSystemEntity.java
@@ -0,0 +1,42 @@
+package org.apache.airavata.registry.core.entities.appcatalog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+
+
+/**
+ * The persistent class for the compute_resource_file_system database table.
+ * 
+ */
+@Entity
+@Table(name="compute_resource_file_system")
+@NamedQuery(name="ComputeResourceFileSystem.findAll", query="SELECT c FROM ComputeResourceFileSystem c")
+public class ComputeResourceFileSystem implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	@EmbeddedId
+	private ComputeResourceFileSystemPK id;
+
+	@Column(name="PATH")
+	private String path;
+
+
+	public ComputeResourceFileSystem() {
+	}
+
+	public ComputeResourceFileSystemPK getId() {
+		return id;
+	}
+
+	public void setId(ComputeResourceFileSystemPK id) {
+		this.id = id;
+	}
+
+	public String getPath() {
+		return path;
+	}
+
+	public void setPath(String path) {
+		this.path = path;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceFileSystemPK.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceFileSystemPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceFileSystemPK.java
new file mode 100644
index 0000000..81586de
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceFileSystemPK.java
@@ -0,0 +1,57 @@
+package appcatlog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+
+/**
+ * The primary key class for the compute_resource_file_system database table.
+ * 
+ */
+@Embeddable
+public class ComputeResourceFileSystemPK implements Serializable {
+	//default serial version id, required for serializable classes.
+	private static final long serialVersionUID = 1L;
+
+	@Column(name="COMPUTE_RESOURCE_ID", insertable=false, updatable=false)
+	private String computeResourceId;
+
+	@Column(name="FILE_SYSTEM")
+	private String fileSystem;
+
+	public ComputeResourceFileSystemPK() {
+	}
+	public String getComputeResourceId() {
+		return this.computeResourceId;
+	}
+	public void setComputeResourceId(String computeResourceId) {
+		this.computeResourceId = computeResourceId;
+	}
+	public String getFileSystem() {
+		return this.fileSystem;
+	}
+	public void setFileSystem(String fileSystem) {
+		this.fileSystem = fileSystem;
+	}
+
+	public boolean equals(Object other) {
+		if (this == other) {
+			return true;
+		}
+		if (!(other instanceof ComputeResourceFileSystemPK)) {
+			return false;
+		}
+		ComputeResourceFileSystemPK castOther = (ComputeResourceFileSystemPK)other;
+		return 
+			this.computeResourceId.equals(castOther.computeResourceId)
+			&& this.fileSystem.equals(castOther.fileSystem);
+	}
+
+	public int hashCode() {
+		final int prime = 31;
+		int hash = 17;
+		hash = hash * prime + this.computeResourceId.hashCode();
+		hash = hash * prime + this.fileSystem.hashCode();
+		
+		return hash;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePreferenceEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePreferenceEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePreferenceEntity.java
new file mode 100644
index 0000000..51ef509
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePreferenceEntity.java
@@ -0,0 +1,171 @@
+package org.apache.airavata.registry.core.entities.appcatalog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+import java.sql.Timestamp;
+
+
+/**
+ * The persistent class for the compute_resource_preference database table.
+ */
+@Entity
+@Table(name = "compute_resource_preference")
+public class ComputeResourcePreference implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @EmbeddedId
+    private ComputeResourcePreferencePK id;
+
+    @Column(name = "ALLOCATION_PROJECT_NUMBER")
+    private String allocationProjectNumber;
+
+    @Column(name = "LOGIN_USERNAME")
+    private String loginUsername;
+
+    @Column(name = "OVERRIDE_BY_AIRAVATA")
+    private short overrideByAiravata;
+
+    @Column(name = "PREFERED_BATCH_QUEUE")
+    private String preferedBatchQueue;
+
+    @Column(name = "PREFERED_DATA_MOVE_PROTOCOL")
+    private String preferedDataMoveProtocol;
+
+    @Column(name = "PREFERED_JOB_SUB_PROTOCOL")
+    private String preferedJobSubProtocol;
+
+    @Column(name = "QUALITY_OF_SERVICE")
+    private String qualityOfService;
+
+    private String reservation;
+
+    @Column(name = "RESERVATION_END_TIME")
+    private Timestamp reservationEndTime;
+
+    @Column(name = "RESERVATION_START_TIME")
+    private Timestamp reservationStartTime;
+
+    @Column(name = "RESOURCE_CS_TOKEN")
+    private String resourceCsToken;
+
+    @Column(name = "SCRATCH_LOCATION")
+    private String scratchLocation;
+
+    @Column(name = "USAGE_REPORTING_GATEWAY_ID")
+    private String usageReportingGatewayId;
+
+    public ComputeResourcePreference() {
+    }
+
+    public ComputeResourcePreferencePK getId() {
+        return id;
+    }
+
+    public void setId(ComputeResourcePreferencePK id) {
+        this.id = id;
+    }
+
+    public String getAllocationProjectNumber() {
+        return allocationProjectNumber;
+    }
+
+    public void setAllocationProjectNumber(String allocationProjectNumber) {
+        this.allocationProjectNumber = allocationProjectNumber;
+    }
+
+    public String getLoginUsername() {
+        return loginUsername;
+    }
+
+    public void setLoginUsername(String loginUsername) {
+        this.loginUsername = loginUsername;
+    }
+
+    public short getOverrideByAiravata() {
+        return overrideByAiravata;
+    }
+
+    public void setOverrideByAiravata(short overrideByAiravata) {
+        this.overrideByAiravata = overrideByAiravata;
+    }
+
+    public String getPreferedBatchQueue() {
+        return preferedBatchQueue;
+    }
+
+    public void setPreferedBatchQueue(String preferedBatchQueue) {
+        this.preferedBatchQueue = preferedBatchQueue;
+    }
+
+    public String getPreferedDataMoveProtocol() {
+        return preferedDataMoveProtocol;
+    }
+
+    public void setPreferedDataMoveProtocol(String preferedDataMoveProtocol) {
+        this.preferedDataMoveProtocol = preferedDataMoveProtocol;
+    }
+
+    public String getPreferedJobSubProtocol() {
+        return preferedJobSubProtocol;
+    }
+
+    public void setPreferedJobSubProtocol(String preferedJobSubProtocol) {
+        this.preferedJobSubProtocol = preferedJobSubProtocol;
+    }
+
+    public String getQualityOfService() {
+        return qualityOfService;
+    }
+
+    public void setQualityOfService(String qualityOfService) {
+        this.qualityOfService = qualityOfService;
+    }
+
+    public String getReservation() {
+        return reservation;
+    }
+
+    public void setReservation(String reservation) {
+        this.reservation = reservation;
+    }
+
+    public Timestamp getReservationEndTime() {
+        return reservationEndTime;
+    }
+
+    public void setReservationEndTime(Timestamp reservationEndTime) {
+        this.reservationEndTime = reservationEndTime;
+    }
+
+    public Timestamp getReservationStartTime() {
+        return reservationStartTime;
+    }
+
+    public void setReservationStartTime(Timestamp reservationStartTime) {
+        this.reservationStartTime = reservationStartTime;
+    }
+
+    public String getResourceCsToken() {
+        return resourceCsToken;
+    }
+
+    public void setResourceCsToken(String resourceCsToken) {
+        this.resourceCsToken = resourceCsToken;
+    }
+
+    public String getScratchLocation() {
+        return scratchLocation;
+    }
+
+    public void setScratchLocation(String scratchLocation) {
+        this.scratchLocation = scratchLocation;
+    }
+
+    public String getUsageReportingGatewayId() {
+        return usageReportingGatewayId;
+    }
+
+    public void setUsageReportingGatewayId(String usageReportingGatewayId) {
+        this.usageReportingGatewayId = usageReportingGatewayId;
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePreferencePK.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePreferencePK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePreferencePK.java
new file mode 100644
index 0000000..8ee1ed4
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePreferencePK.java
@@ -0,0 +1,57 @@
+package appcatlog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+
+/**
+ * The primary key class for the compute_resource_preference database table.
+ * 
+ */
+@Embeddable
+public class ComputeResourcePreferencePK implements Serializable {
+	//default serial version id, required for serializable classes.
+	private static final long serialVersionUID = 1L;
+
+	@Column(name="GATEWAY_ID", insertable=false, updatable=false)
+	private String gatewayId;
+
+	@Column(name="RESOURCE_ID", insertable=false, updatable=false)
+	private String resourceId;
+
+	public ComputeResourcePreferencePK() {
+	}
+	public String getGatewayId() {
+		return this.gatewayId;
+	}
+	public void setGatewayId(String gatewayId) {
+		this.gatewayId = gatewayId;
+	}
+	public String getResourceId() {
+		return this.resourceId;
+	}
+	public void setResourceId(String resourceId) {
+		this.resourceId = resourceId;
+	}
+
+	public boolean equals(Object other) {
+		if (this == other) {
+			return true;
+		}
+		if (!(other instanceof ComputeResourcePreferencePK)) {
+			return false;
+		}
+		ComputeResourcePreferencePK castOther = (ComputeResourcePreferencePK)other;
+		return 
+			this.gatewayId.equals(castOther.gatewayId)
+			&& this.resourceId.equals(castOther.resourceId);
+	}
+
+	public int hashCode() {
+		final int prime = 31;
+		int hash = 17;
+		hash = hash * prime + this.gatewayId.hashCode();
+		hash = hash * prime + this.resourceId.hashCode();
+		
+		return hash;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataMovementInterfaceEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataMovementInterfaceEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataMovementInterfaceEntity.java
new file mode 100644
index 0000000..08a3a2d
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataMovementInterfaceEntity.java
@@ -0,0 +1,72 @@
+package org.apache.airavata.registry.core.entities.appcatalog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+import java.sql.Timestamp;
+
+/**
+ * The persistent class for the data_movement_interface database table.
+ */
+@Entity
+@Table(name = "data_movement_interface")
+public class DataMovementInterface implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @EmbeddedId
+    private DataMovementInterfacePK id;
+
+    @Column(name = "CREATION_TIME")
+    private Timestamp creationTime;
+
+    @Column(name = "DATA_MOVEMENT_PROTOCOL")
+    private String dataMovementProtocol;
+
+    @Column(name = "PRIORITY_ORDER")
+    private int priorityOrder;
+
+    @Column(name = "UPDATE_TIME")
+    private Timestamp updateTime;
+
+    public DataMovementInterface() {
+    }
+
+    public DataMovementInterfacePK getId() {
+        return id;
+    }
+
+    public void setId(DataMovementInterfacePK id) {
+        this.id = id;
+    }
+
+    public Timestamp getCreationTime() {
+        return creationTime;
+    }
+
+    public void setCreationTime(Timestamp creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    public String getDataMovementProtocol() {
+        return dataMovementProtocol;
+    }
+
+    public void setDataMovementProtocol(String dataMovementProtocol) {
+        this.dataMovementProtocol = dataMovementProtocol;
+    }
+
+    public int getPriorityOrder() {
+        return priorityOrder;
+    }
+
+    public void setPriorityOrder(int priorityOrder) {
+        this.priorityOrder = priorityOrder;
+    }
+
+    public Timestamp getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Timestamp updateTime) {
+        this.updateTime = updateTime;
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataMovementInterfacePK.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataMovementInterfacePK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataMovementInterfacePK.java
new file mode 100644
index 0000000..921570f
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataMovementInterfacePK.java
@@ -0,0 +1,57 @@
+package appcatlog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+
+/**
+ * The primary key class for the data_movement_interface database table.
+ * 
+ */
+@Embeddable
+public class DataMovementInterfacePK implements Serializable {
+	//default serial version id, required for serializable classes.
+	private static final long serialVersionUID = 1L;
+
+	@Column(name="COMPUTE_RESOURCE_ID", insertable=false, updatable=false)
+	private String computeResourceId;
+
+	@Column(name="DATA_MOVEMENT_INTERFACE_ID")
+	private String dataMovementInterfaceId;
+
+	public DataMovementInterfacePK() {
+	}
+	public String getComputeResourceId() {
+		return this.computeResourceId;
+	}
+	public void setComputeResourceId(String computeResourceId) {
+		this.computeResourceId = computeResourceId;
+	}
+	public String getDataMovementInterfaceId() {
+		return this.dataMovementInterfaceId;
+	}
+	public void setDataMovementInterfaceId(String dataMovementInterfaceId) {
+		this.dataMovementInterfaceId = dataMovementInterfaceId;
+	}
+
+	public boolean equals(Object other) {
+		if (this == other) {
+			return true;
+		}
+		if (!(other instanceof DataMovementInterfacePK)) {
+			return false;
+		}
+		DataMovementInterfacePK castOther = (DataMovementInterfacePK)other;
+		return 
+			this.computeResourceId.equals(castOther.computeResourceId)
+			&& this.dataMovementInterfaceId.equals(castOther.dataMovementInterfaceId);
+	}
+
+	public int hashCode() {
+		final int prime = 31;
+		int hash = 17;
+		hash = hash * prime + this.computeResourceId.hashCode();
+		hash = hash * prime + this.dataMovementInterfaceId.hashCode();
+		
+		return hash;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataStoragePreferenceEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataStoragePreferenceEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataStoragePreferenceEntity.java
new file mode 100644
index 0000000..f3d7c55
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataStoragePreferenceEntity.java
@@ -0,0 +1,60 @@
+package org.apache.airavata.registry.core.entities.appcatalog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+
+/**
+ * The persistent class for the data_storage_preference database table.
+ */
+@Entity
+@Table(name = "data_storage_preference")
+public class DataStoragePreference implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @EmbeddedId
+    private DataStoragePreferencePK id;
+
+    @Column(name = "FS_ROOT_LOCATION")
+    private String fsRootLocation;
+
+    @Column(name = "LOGIN_USERNAME")
+    private String loginUsername;
+
+    @Column(name = "RESOURCE_CS_TOKEN")
+    private String resourceCsToken;
+
+    public DataStoragePreference() {
+    }
+
+    public DataStoragePreferencePK getId() {
+        return id;
+    }
+
+    public void setId(DataStoragePreferencePK id) {
+        this.id = id;
+    }
+
+    public String getFsRootLocation() {
+        return fsRootLocation;
+    }
+
+    public void setFsRootLocation(String fsRootLocation) {
+        this.fsRootLocation = fsRootLocation;
+    }
+
+    public String getLoginUsername() {
+        return loginUsername;
+    }
+
+    public void setLoginUsername(String loginUsername) {
+        this.loginUsername = loginUsername;
+    }
+
+    public String getResourceCsToken() {
+        return resourceCsToken;
+    }
+
+    public void setResourceCsToken(String resourceCsToken) {
+        this.resourceCsToken = resourceCsToken;
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataStoragePreferencePK.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataStoragePreferencePK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataStoragePreferencePK.java
new file mode 100644
index 0000000..24b28cf
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataStoragePreferencePK.java
@@ -0,0 +1,57 @@
+package appcatlog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+
+/**
+ * The primary key class for the data_storage_preference database table.
+ * 
+ */
+@Embeddable
+public class DataStoragePreferencePK implements Serializable {
+	//default serial version id, required for serializable classes.
+	private static final long serialVersionUID = 1L;
+
+	@Column(name="GATEWAY_ID", insertable=false, updatable=false)
+	private String gatewayId;
+
+	@Column(name="STORAGE_RESOURCE_ID")
+	private String storageResourceId;
+
+	public DataStoragePreferencePK() {
+	}
+	public String getGatewayId() {
+		return this.gatewayId;
+	}
+	public void setGatewayId(String gatewayId) {
+		this.gatewayId = gatewayId;
+	}
+	public String getStorageResourceId() {
+		return this.storageResourceId;
+	}
+	public void setStorageResourceId(String storageResourceId) {
+		this.storageResourceId = storageResourceId;
+	}
+
+	public boolean equals(Object other) {
+		if (this == other) {
+			return true;
+		}
+		if (!(other instanceof DataStoragePreferencePK)) {
+			return false;
+		}
+		DataStoragePreferencePK castOther = (DataStoragePreferencePK)other;
+		return 
+			this.gatewayId.equals(castOther.gatewayId)
+			&& this.storageResourceId.equals(castOther.storageResourceId);
+	}
+
+	public int hashCode() {
+		final int prime = 31;
+		int hash = 17;
+		hash = hash * prime + this.gatewayId.hashCode();
+		hash = hash * prime + this.storageResourceId.hashCode();
+		
+		return hash;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayProfileEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayProfileEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayProfileEntity.java
new file mode 100644
index 0000000..9ae0214
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayProfileEntity.java
@@ -0,0 +1,87 @@
+package org.apache.airavata.registry.core.entities.appcatalog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+import java.sql.Timestamp;
+import java.util.List;
+
+
+/**
+ * The persistent class for the gateway_profile database table.
+ */
+@Entity
+@Table(name = "gateway_profile")
+public class GatewayProfile implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @Column(name = "GATEWAY_ID")
+    private String gatewayId;
+
+    @Column(name = "CREATION_TIME")
+    private Timestamp creationTime;
+
+    @Column(name = "CS_TOKEN")
+    private String csToken;
+
+    @Column(name = "IDENTITY_SERVER_PWD_CRED_TOKEN")
+    private String identityServerPwdCredToken;
+
+    @Column(name = "IDENTITY_SERVER_TENANT")
+    private String identityServerTenant;
+
+    @Column(name = "UPDATE_TIME")
+    private Timestamp updateTime;
+
+
+    public GatewayProfile() {
+    }
+
+    public String getGatewayId() {
+        return gatewayId;
+    }
+
+    public void setGatewayId(String gatewayId) {
+        this.gatewayId = gatewayId;
+    }
+
+    public Timestamp getCreationTime() {
+        return creationTime;
+    }
+
+    public void setCreationTime(Timestamp creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    public String getCsToken() {
+        return csToken;
+    }
+
+    public void setCsToken(String csToken) {
+        this.csToken = csToken;
+    }
+
+    public String getIdentityServerPwdCredToken() {
+        return identityServerPwdCredToken;
+    }
+
+    public void setIdentityServerPwdCredToken(String identityServerPwdCredToken) {
+        this.identityServerPwdCredToken = identityServerPwdCredToken;
+    }
+
+    public String getIdentityServerTenant() {
+        return identityServerTenant;
+    }
+
+    public void setIdentityServerTenant(String identityServerTenant) {
+        this.identityServerTenant = identityServerTenant;
+    }
+
+    public Timestamp getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Timestamp updateTime) {
+        this.updateTime = updateTime;
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusGkEndpointEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusGkEndpointEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusGkEndpointEntity.java
new file mode 100644
index 0000000..71acd69
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusGkEndpointEntity.java
@@ -0,0 +1,31 @@
+package org.apache.airavata.registry.core.entities.appcatalog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+
+
+/**
+ * The persistent class for the globus_gk_endpoint database table.
+ * 
+ */
+@Entity
+@Table(name="globus_gk_endpoint")
+public class GlobusGkEndpoint implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	@EmbeddedId
+	private GlobusGkEndpointPK id;
+
+	
+
+	public GlobusGkEndpoint() {
+	}
+
+	public GlobusGkEndpointPK getId() {
+		return id;
+	}
+
+	public void setId(GlobusGkEndpointPK id) {
+		this.id = id;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusGkEndpointPK.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusGkEndpointPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusGkEndpointPK.java
new file mode 100644
index 0000000..ea8f651
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusGkEndpointPK.java
@@ -0,0 +1,57 @@
+package appcatlog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+
+/**
+ * The primary key class for the globus_gk_endpoint database table.
+ * 
+ */
+@Embeddable
+public class GlobusGkEndpointPK implements Serializable {
+	//default serial version id, required for serializable classes.
+	private static final long serialVersionUID = 1L;
+
+	@Column(name="SUBMISSION_ID", insertable=false, updatable=false)
+	private String submissionId;
+
+	@Column(name="ENDPOINT")
+	private String endpoint;
+
+	public GlobusGkEndpointPK() {
+	}
+	public String getSubmissionId() {
+		return this.submissionId;
+	}
+	public void setSubmissionId(String submissionId) {
+		this.submissionId = submissionId;
+	}
+	public String getEndpoint() {
+		return this.endpoint;
+	}
+	public void setEndpoint(String endpoint) {
+		this.endpoint = endpoint;
+	}
+
+	public boolean equals(Object other) {
+		if (this == other) {
+			return true;
+		}
+		if (!(other instanceof GlobusGkEndpointPK)) {
+			return false;
+		}
+		GlobusGkEndpointPK castOther = (GlobusGkEndpointPK)other;
+		return 
+			this.submissionId.equals(castOther.submissionId)
+			&& this.endpoint.equals(castOther.endpoint);
+	}
+
+	public int hashCode() {
+		final int prime = 31;
+		int hash = 17;
+		hash = hash * prime + this.submissionId.hashCode();
+		hash = hash * prime + this.endpoint.hashCode();
+		
+		return hash;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusSubmissionEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusSubmissionEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusSubmissionEntity.java
new file mode 100644
index 0000000..39d8fe8
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusSubmissionEntity.java
@@ -0,0 +1,52 @@
+package org.apache.airavata.registry.core.entities.appcatalog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+import java.util.List;
+
+/**
+ * The persistent class for the globus_submission database table.
+ * 
+ */
+@Entity
+@Table(name = "globus_submission")
+public class GlobusSubmission implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@Column(name = "SUBMISSION_ID")
+	private String submissionId;
+
+	@Column(name = "RESOURCE_JOB_MANAGER")
+	private String resourceJobManager;
+
+	@Column(name = "SECURITY_PROTOCAL")
+	private String securityProtocal;
+
+	public GlobusSubmission() {
+	}
+
+	public String getSubmissionId() {
+		return submissionId;
+	}
+
+	public void setSubmissionId(String submissionId) {
+		this.submissionId = submissionId;
+	}
+
+	public String getResourceJobManager() {
+		return resourceJobManager;
+	}
+
+	public void setResourceJobManager(String resourceJobManager) {
+		this.resourceJobManager = resourceJobManager;
+	}
+
+	public String getSecurityProtocal() {
+		return securityProtocal;
+	}
+
+	public void setSecurityProtocal(String securityProtocal) {
+		this.securityProtocal = securityProtocal;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpDataMovementEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpDataMovementEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpDataMovementEntity.java
new file mode 100644
index 0000000..ea76a6a
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpDataMovementEntity.java
@@ -0,0 +1,65 @@
+package org.apache.airavata.registry.core.entities.appcatalog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+import java.sql.Timestamp;
+import java.util.List;
+
+
+/**
+ * The persistent class for the gridftp_data_movement database table.
+ */
+@Entity
+@Table(name = "gridftp_data_movement")
+public class GridftpDataMovement implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @Column(name = "DATA_MOVEMENT_INTERFACE_ID")
+    private String dataMovementInterfaceId;
+
+    @Column(name = "CREATION_TIME")
+    private Timestamp creationTime;
+
+    @Column(name = "SECURITY_PROTOCOL")
+    private String securityProtocol;
+
+    @Column(name = "UPDATE_TIME")
+    private Timestamp updateTime;
+
+
+    public GridftpDataMovement() {
+    }
+
+    public String getDataMovementInterfaceId() {
+        return dataMovementInterfaceId;
+    }
+
+    public void setDataMovementInterfaceId(String dataMovementInterfaceId) {
+        this.dataMovementInterfaceId = dataMovementInterfaceId;
+    }
+
+    public Timestamp getCreationTime() {
+        return creationTime;
+    }
+
+    public void setCreationTime(Timestamp creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    public String getSecurityProtocol() {
+        return securityProtocol;
+    }
+
+    public void setSecurityProtocol(String securityProtocol) {
+        this.securityProtocol = securityProtocol;
+    }
+
+    public Timestamp getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Timestamp updateTime) {
+        this.updateTime = updateTime;
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpEndpointEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpEndpointEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpEndpointEntity.java
new file mode 100644
index 0000000..fab10d0
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpEndpointEntity.java
@@ -0,0 +1,52 @@
+package org.apache.airavata.registry.core.entities.appcatalog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+import java.sql.Timestamp;
+
+
+/**
+ * The persistent class for the gridftp_endpoint database table.
+ */
+@Entity
+@Table(name = "gridftp_endpoint")
+public class GridftpEndpoint implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @EmbeddedId
+    private GridftpEndpointPK id;
+
+    @Column(name = "CREATION_TIME")
+    private Timestamp creationTime;
+
+    @Column(name = "UPDATE_TIME")
+    private Timestamp updateTime;
+
+
+    public GridftpEndpoint() {
+    }
+
+    public GridftpEndpointPK getId() {
+        return id;
+    }
+
+    public void setId(GridftpEndpointPK id) {
+        this.id = id;
+    }
+
+    public Timestamp getCreationTime() {
+        return creationTime;
+    }
+
+    public void setCreationTime(Timestamp creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    public Timestamp getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Timestamp updateTime) {
+        this.updateTime = updateTime;
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpEndpointPK.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpEndpointPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpEndpointPK.java
new file mode 100644
index 0000000..da0bfc5
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpEndpointPK.java
@@ -0,0 +1,56 @@
+package appcatlog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+
+/**
+ * The primary key class for the gridftp_endpoint database table.
+ * 
+ */
+@Embeddable
+public class GridftpEndpointPK implements Serializable {
+	//default serial version id, required for serializable classes.
+	private static final long serialVersionUID = 1L;
+
+	@Column(name="DATA_MOVEMENT_INTERFACE_ID", insertable=false, updatable=false)
+	private String dataMovementInterfaceId;
+
+	private String endpoint;
+
+	public GridftpEndpointPK() {
+	}
+	public String getDataMovementInterfaceId() {
+		return this.dataMovementInterfaceId;
+	}
+	public void setDataMovementInterfaceId(String dataMovementInterfaceId) {
+		this.dataMovementInterfaceId = dataMovementInterfaceId;
+	}
+	public String getEndpoint() {
+		return this.endpoint;
+	}
+	public void setEndpoint(String endpoint) {
+		this.endpoint = endpoint;
+	}
+
+	public boolean equals(Object other) {
+		if (this == other) {
+			return true;
+		}
+		if (!(other instanceof GridftpEndpointPK)) {
+			return false;
+		}
+		GridftpEndpointPK castOther = (GridftpEndpointPK)other;
+		return 
+			this.dataMovementInterfaceId.equals(castOther.dataMovementInterfaceId)
+			&& this.endpoint.equals(castOther.endpoint);
+	}
+
+	public int hashCode() {
+		final int prime = 31;
+		int hash = 17;
+		hash = hash * prime + this.dataMovementInterfaceId.hashCode();
+		hash = hash * prime + this.endpoint.hashCode();
+		
+		return hash;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshExportEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshExportEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshExportEntity.java
new file mode 100644
index 0000000..1f908ca
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshExportEntity.java
@@ -0,0 +1,28 @@
+package org.apache.airavata.registry.core.entities.appcatalog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+
+
+/**
+ * The persistent class for the gsissh_export database table.
+ */
+@Entity
+@Table(name = "gsissh_export")
+public class GsisshExport implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @EmbeddedId
+    private GsisshExportPK id;
+
+    public GsisshExport() {
+    }
+
+    public GsisshExportPK getId() {
+        return id;
+    }
+
+    public void setId(GsisshExportPK id) {
+        this.id = id;
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshExportPK.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshExportPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshExportPK.java
new file mode 100644
index 0000000..0fbeae6
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshExportPK.java
@@ -0,0 +1,57 @@
+package appcatlog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+
+/**
+ * The primary key class for the gsissh_export database table.
+ * 
+ */
+@Embeddable
+public class GsisshExportPK implements Serializable {
+	//default serial version id, required for serializable classes.
+	private static final long serialVersionUID = 1L;
+
+	@Column(name="SUBMISSION_ID", insertable=false, updatable=false)
+	private String submissionId;
+
+	@Column(name="EXPORT")
+	private String export;
+
+	public GsisshExportPK() {
+	}
+	public String getSubmissionId() {
+		return this.submissionId;
+	}
+	public void setSubmissionId(String submissionId) {
+		this.submissionId = submissionId;
+	}
+	public String getExport() {
+		return this.export;
+	}
+	public void setExport(String export) {
+		this.export = export;
+	}
+
+	public boolean equals(Object other) {
+		if (this == other) {
+			return true;
+		}
+		if (!(other instanceof GsisshExportPK)) {
+			return false;
+		}
+		GsisshExportPK castOther = (GsisshExportPK)other;
+		return 
+			this.submissionId.equals(castOther.submissionId)
+			&& this.export.equals(castOther.export);
+	}
+
+	public int hashCode() {
+		final int prime = 31;
+		int hash = 17;
+		hash = hash * prime + this.submissionId.hashCode();
+		hash = hash * prime + this.export.hashCode();
+		
+		return hash;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPostjobcommandEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPostjobcommandEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPostjobcommandEntity.java
new file mode 100644
index 0000000..5a0e038
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPostjobcommandEntity.java
@@ -0,0 +1,28 @@
+package org.apache.airavata.registry.core.entities.appcatalog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+
+/**
+ * The persistent class for the gsissh_postjobcommand database table.
+ * 
+ */
+@Entity
+@Table(name = "gsissh_postjobcommand")
+public class GsisshPostjobcommand implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	@EmbeddedId
+	private GsisshPostjobcommandPK id;
+
+	public GsisshPostjobcommand() {
+	}
+
+	public GsisshPostjobcommandPK getId() {
+		return id;
+	}
+
+	public void setId(GsisshPostjobcommandPK id) {
+		this.id = id;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPostjobcommandPK.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPostjobcommandPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPostjobcommandPK.java
new file mode 100644
index 0000000..e86dfc0
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPostjobcommandPK.java
@@ -0,0 +1,59 @@
+package appcatlog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+
+/**
+ * The primary key class for the gsissh_postjobcommand database table.
+ * 
+ */
+@Embeddable
+public class GsisshPostjobcommandPK implements Serializable {
+	// default serial version id, required for serializable classes.
+	private static final long serialVersionUID = 1L;
+
+	@Column(name = "SUBMISSION_ID", insertable = false, updatable = false)
+	private String submissionId;
+
+	@Column(name = "COMMAND")
+	private String command;
+
+	public GsisshPostjobcommandPK() {
+	}
+
+	public String getSubmissionId() {
+		return this.submissionId;
+	}
+
+	public void setSubmissionId(String submissionId) {
+		this.submissionId = submissionId;
+	}
+
+	public String getCommand() {
+		return this.command;
+	}
+
+	public void setCommand(String command) {
+		this.command = command;
+	}
+
+	public boolean equals(Object other) {
+		if (this == other) {
+			return true;
+		}
+		if (!(other instanceof GsisshPostjobcommandPK)) {
+			return false;
+		}
+		GsisshPostjobcommandPK castOther = (GsisshPostjobcommandPK) other;
+		return this.submissionId.equals(castOther.submissionId) && this.command.equals(castOther.command);
+	}
+
+	public int hashCode() {
+		final int prime = 31;
+		int hash = 17;
+		hash = hash * prime + this.submissionId.hashCode();
+		hash = hash * prime + this.command.hashCode();
+
+		return hash;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPrejobcommandEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPrejobcommandEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPrejobcommandEntity.java
new file mode 100644
index 0000000..30b0852
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPrejobcommandEntity.java
@@ -0,0 +1,29 @@
+package org.apache.airavata.registry.core.entities.appcatalog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+
+
+/**
+ * The persistent class for the gsissh_prejobcommand database table.
+ */
+@Entity
+@Table(name = "gsissh_prejobcommand")
+public class GsisshPrejobcommand implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @EmbeddedId
+    private GsisshPrejobcommandPK id;
+
+
+    public GsisshPrejobcommand() {
+    }
+
+    public GsisshPrejobcommandPK getId() {
+        return id;
+    }
+
+    public void setId(GsisshPrejobcommandPK id) {
+        this.id = id;
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPrejobcommandPK.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPrejobcommandPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPrejobcommandPK.java
new file mode 100644
index 0000000..f1f5d88
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPrejobcommandPK.java
@@ -0,0 +1,57 @@
+package appcatlog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+
+/**
+ * The primary key class for the gsissh_prejobcommand database table.
+ * 
+ */
+@Embeddable
+public class GsisshPrejobcommandPK implements Serializable {
+	//default serial version id, required for serializable classes.
+	private static final long serialVersionUID = 1L;
+
+	@Column(name="SUBMISSION_ID", insertable=false, updatable=false)
+	private String submissionId;
+
+	@Column(name="COMMAND")
+	private String command;
+
+	public GsisshPrejobcommandPK() {
+	}
+	public String getSubmissionId() {
+		return this.submissionId;
+	}
+	public void setSubmissionId(String submissionId) {
+		this.submissionId = submissionId;
+	}
+	public String getCommand() {
+		return this.command;
+	}
+	public void setCommand(String command) {
+		this.command = command;
+	}
+
+	public boolean equals(Object other) {
+		if (this == other) {
+			return true;
+		}
+		if (!(other instanceof GsisshPrejobcommandPK)) {
+			return false;
+		}
+		GsisshPrejobcommandPK castOther = (GsisshPrejobcommandPK)other;
+		return 
+			this.submissionId.equals(castOther.submissionId)
+			&& this.command.equals(castOther.command);
+	}
+
+	public int hashCode() {
+		final int prime = 31;
+		int hash = 17;
+		hash = hash * prime + this.submissionId.hashCode();
+		hash = hash * prime + this.command.hashCode();
+		
+		return hash;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/3a748bdc/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshSubmissionEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshSubmissionEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshSubmissionEntity.java
new file mode 100644
index 0000000..852d944
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshSubmissionEntity.java
@@ -0,0 +1,74 @@
+package org.apache.airavata.registry.core.entities.appcatalog;
+
+import java.io.Serializable;
+import javax.persistence.*;
+import java.util.List;
+
+/**
+ * The persistent class for the gsissh_submission database table.
+ * 
+ */
+@Entity
+@Table(name = "gsissh_submission")
+public class GsisshSubmission implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@Column(name = "SUBMISSION_ID")
+	private String submissionId;
+
+	@Column(name = "INSTALLED_PATH")
+	private String installedPath;
+
+	@Column(name = "MONITOR_MODE")
+	private String monitorMode;
+
+	@Column(name = "RESOURCE_JOB_MANAGER")
+	private String resourceJobManager;
+
+	@Column(name = "SSH_PORT")
+	private int sshPort;
+
+	public GsisshSubmission() {
+	}
+
+	public String getSubmissionId() {
+		return submissionId;
+	}
+
+	public void setSubmissionId(String submissionId) {
+		this.submissionId = submissionId;
+	}
+
+	public String getInstalledPath() {
+		return installedPath;
+	}
+
+	public void setInstalledPath(String installedPath) {
+		this.installedPath = installedPath;
+	}
+
+	public String getMonitorMode() {
+		return monitorMode;
+	}
+
+	public void setMonitorMode(String monitorMode) {
+		this.monitorMode = monitorMode;
+	}
+
+	public String getResourceJobManager() {
+		return resourceJobManager;
+	}
+
+	public void setResourceJobManager(String resourceJobManager) {
+		this.resourceJobManager = resourceJobManager;
+	}
+
+	public int getSshPort() {
+		return sshPort;
+	}
+
+	public void setSshPort(int sshPort) {
+		this.sshPort = sshPort;
+	}
+}
\ No newline at end of file