airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject [46/51] [abbrv] [partial] airavata git commit: registry refactoring
Date Thu, 04 Jun 2015 20:34:34 GMT
http://git-wip-us.apache.org/repos/asf/airavata/blob/ec8c6202/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/PostJobCommand.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/PostJobCommand.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/PostJobCommand.java
deleted file mode 100644
index 6b1a052..0000000
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/PostJobCommand.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.aiaravata.application.catalog.data.model;
-
-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;
-
-@Entity
-@Table(name = "POSTJOB_COMMAND")
-@IdClass(PostJobCommandPK.class)
-public class PostJobCommand implements Serializable {
-    @Id
-    @Column(name = "APPDEPLOYMENT_ID")
-    private String deploymentId;
-    @Id
-    @Column(name = "COMMAND")
-    private String command;
-
-    @ManyToOne(cascade= CascadeType.MERGE)
-    @JoinColumn(name = "APPDEPLOYMENT_ID")
-    private ApplicationDeployment deployment;
-
-    public String getDeploymentId() {
-        return deploymentId;
-    }
-
-    public void setDeploymentId(String deploymentId) {
-        this.deploymentId = deploymentId;
-    }
-
-    public String getCommand() {
-        return command;
-    }
-
-    public void setCommand(String command) {
-        this.command = command;
-    }
-
-    public ApplicationDeployment getDeployment() {
-        return deployment;
-    }
-
-    public void setDeployment(ApplicationDeployment deployment) {
-        this.deployment = deployment;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/ec8c6202/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/PostJobCommandPK.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/PostJobCommandPK.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/PostJobCommandPK.java
deleted file mode 100644
index 907415e..0000000
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/PostJobCommandPK.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.aiaravata.application.catalog.data.model;
-
-import java.io.Serializable;
-
-public class PostJobCommandPK implements Serializable {
-    private String deploymentId;
-    private String command;
-
-    public PostJobCommandPK(String submissionID, String command) {
-        this.deploymentId = submissionID;
-        this.command = command;
-    }
-
-    public PostJobCommandPK() {
-        ;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return false;
-    }
-
-    @Override
-    public int hashCode() {
-        return 1;
-    }
-
-    public String getDeploymentId() {
-        return deploymentId;
-    }
-
-    public void setDeploymentId(String deploymentId) {
-        this.deploymentId = deploymentId;
-    }
-
-    public String getCommand() {
-        return command;
-    }
-
-    public void setCommand(String command) {
-        this.command = command;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/ec8c6202/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/PreJobCommand.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/PreJobCommand.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/PreJobCommand.java
deleted file mode 100644
index 02e8a65..0000000
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/PreJobCommand.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.aiaravata.application.catalog.data.model;
-
-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;
-
-@Entity
-@Table(name = "PREJOB_COMMAND")
-@IdClass(PreJobCommandPK.class)
-public class PreJobCommand implements Serializable {
-    @Id
-    @Column(name = "APPDEPLOYMENT_ID")
-    private String deploymentId;
-    @Id
-    @Column(name = "COMMAND")
-    private String command;
-
-    @ManyToOne(cascade= CascadeType.MERGE)
-    @JoinColumn(name = "APPDEPLOYMENT_ID")
-    private ApplicationDeployment applicationDeployment;
-
-    public String getDeploymentId() {
-        return deploymentId;
-    }
-
-    public void setDeploymentId(String deploymentId) {
-        this.deploymentId = deploymentId;
-    }
-
-    public String getCommand() {
-        return command;
-    }
-
-    public void setCommand(String command) {
-        this.command = command;
-    }
-
-    public ApplicationDeployment getApplicationDeployment() {
-        return applicationDeployment;
-    }
-
-    public void setApplicationDeployment(ApplicationDeployment applicationDeployment) {
-        this.applicationDeployment = applicationDeployment;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/ec8c6202/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/PreJobCommandPK.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/PreJobCommandPK.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/PreJobCommandPK.java
deleted file mode 100644
index 9382335..0000000
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/PreJobCommandPK.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.aiaravata.application.catalog.data.model;
-
-import java.io.Serializable;
-
-public class PreJobCommandPK implements Serializable {
-    private String deploymentId;
-    private String command;
-
-    public PreJobCommandPK(String deploymentId, String command) {
-        this.deploymentId = deploymentId;
-        this.command = command;
-    }
-
-    public PreJobCommandPK() {
-        ;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return false;
-    }
-
-    @Override
-    public int hashCode() {
-        return 1;
-    }
-
-    public String getDeploymentId() {
-        return deploymentId;
-    }
-
-    public void setDeploymentId(String deploymentId) {
-        this.deploymentId = deploymentId;
-    }
-
-    public String getCommand() {
-        return command;
-    }
-
-    public void setCommand(String command) {
-        this.command = command;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/ec8c6202/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ResourceJobManager.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ResourceJobManager.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ResourceJobManager.java
deleted file mode 100644
index 65b0f3c..0000000
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ResourceJobManager.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.aiaravata.application.catalog.data.model;
-
-import java.io.Serializable;
-import java.sql.Timestamp;
-
-import javax.persistence.Column;
-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 {
-	
-	@Id
-	@Column(name = "RESOURCE_JOB_MANAGER_ID")
-	private String resourceJobManagerId;
-	
-	@Column(name = "PUSH_MONITORING_ENDPOINT")
-	private String pushMonitoringEndpoint;
-	
-	@Column(name = "JOB_MANAGER_BIN_PATH")
-	private String jobManagerBinPath;
-	
-	@Column(name = "RESOURCE_JOB_MANAGER_TYPE")
-	private String resourceJobManagerType;
-
-    @Column(name = "CREATION_TIME")
-    private Timestamp creationTime;
-
-    @Column(name = "UPDATE_TIME")
-    private Timestamp updateTime;
-
-    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;
-    }
-	
-	public String getResourceJobManagerId() {
-		return resourceJobManagerId;
-	}
-	
-	public String getPushMonitoringEndpoint() {
-		return pushMonitoringEndpoint;
-	}
-	
-	public String getJobManagerBinPath() {
-		return jobManagerBinPath;
-	}
-	
-	public String getResourceJobManagerType() {
-		return resourceJobManagerType;
-	}
-	
-	public void setResourceJobManagerId(String resourceJobManagerId) {
-		this.resourceJobManagerId=resourceJobManagerId;
-	}
-	
-	public void setPushMonitoringEndpoint(String pushMonitoringEndpoint) {
-		this.pushMonitoringEndpoint=pushMonitoringEndpoint;
-	}
-	
-	public void setJobManagerBinPath(String jobManagerBinPath) {
-		this.jobManagerBinPath=jobManagerBinPath;
-	}
-	
-	public void setResourceJobManagerType(String resourceJobManagerType) {
-		this.resourceJobManagerType=resourceJobManagerType;
-	}
-}
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/ec8c6202/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ScpDataMovement.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ScpDataMovement.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ScpDataMovement.java
deleted file mode 100644
index 3cf038b..0000000
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ScpDataMovement.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.aiaravata.application.catalog.data.model;
-
-import java.io.Serializable;
-import java.sql.Timestamp;
-
-import javax.persistence.Column;
-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 {
-	
-	@Column(name = "QUEUE_DESCRIPTION")
-	private String queueDescription;
-	
-	@Id
-	@Column(name = "DATA_MOVEMENT_INTERFACE_ID")
-	private String dataMovementInterfaceId;
-	
-	@Column(name = "SECURITY_PROTOCOL")
-	private String securityProtocol;
-	
-	@Column(name = "ALTERNATIVE_SCP_HOSTNAME")
-	private String alternativeScpHostname;
-	
-	@Column(name = "SSH_PORT")
-	private int sshPort;
-
-    @Column(name = "CREATION_TIME")
-    private Timestamp creationTime;
-
-    @Column(name = "UPDATE_TIME")
-    private Timestamp updateTime;
-
-    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;
-    }
-
-
-    public String getQueueDescription() {
-		return queueDescription;
-	}
-	
-	public String getDataMovementInterfaceId() {
-		return dataMovementInterfaceId;
-	}
-	
-	public String getSecurityProtocol() {
-		return securityProtocol;
-	}
-	
-	public String getAlternativeScpHostname() {
-		return alternativeScpHostname;
-	}
-	
-	public int getSshPort() {
-		return sshPort;
-	}
-	
-	public void setQueueDescription(String queueDescription) {
-		this.queueDescription=queueDescription;
-	}
-	
-	public void setDataMovementInterfaceId(String dataMovementInterfaceId) {
-		this.dataMovementInterfaceId=dataMovementInterfaceId;
-	}
-	
-	public void setSecurityProtocol(String securityProtocol) {
-		this.securityProtocol=securityProtocol;
-	}
-	
-	public void setAlternativeScpHostname(String alternativeScpHostname) {
-		this.alternativeScpHostname=alternativeScpHostname;
-	}
-	
-	public void setSshPort(int sshPort) {
-		this.sshPort=sshPort;
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/ec8c6202/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/SshJobSubmission.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/SshJobSubmission.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/SshJobSubmission.java
deleted file mode 100644
index 13a7861..0000000
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/SshJobSubmission.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.aiaravata.application.catalog.data.model;
-
-import java.io.Serializable;
-import java.sql.Timestamp;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-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 {
-	
-	@Column(name = "RESOURCE_JOB_MANAGER_ID")
-	private String resourceJobManagerId;
-	
-	@ManyToOne(cascade= CascadeType.MERGE)
-	@JoinColumn(name = "RESOURCE_JOB_MANAGER_ID")
-	private ResourceJobManager resourceJobManager;
-	
-	@Id
-	@Column(name = "JOB_SUBMISSION_INTERFACE_ID")
-	private String jobSubmissionInterfaceId;
-	
-	@Column(name = "ALTERNATIVE_SSH_HOSTNAME")
-	private String alternativeSshHostname;
-	
-	@Column(name = "SECURITY_PROTOCOL")
-	private String securityProtocol;
-	
-	@Column(name = "SSH_PORT")
-	private int sshPort;
-
-    @Column(name = "MONITOR_MODE")
-    private String monitorMode;
-
-    @Column(name = "CREATION_TIME")
-    private Timestamp creationTime;
-
-    @Column(name = "UPDATE_TIME")
-    private Timestamp updateTime;
-
-    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;
-    }
-
-
-    public String getResourceJobManagerId() {
-		return resourceJobManagerId;
-	}
-	
-	public ResourceJobManager getResourceJobManager() {
-		return resourceJobManager;
-	}
-	
-	public String getJobSubmissionInterfaceId() {
-		return jobSubmissionInterfaceId;
-	}
-	
-	public String getAlternativeSshHostname() {
-		return alternativeSshHostname;
-	}
-	
-	public String getSecurityProtocol() {
-		return securityProtocol;
-	}
-	
-	public int getSshPort() {
-		return sshPort;
-	}
-	
-	public void setResourceJobManagerId(String resourceJobManagerId) {
-		this.resourceJobManagerId=resourceJobManagerId;
-	}
-	
-	public void setResourceJobManager(ResourceJobManager resourceJobManager) {
-		this.resourceJobManager=resourceJobManager;
-	}
-	
-	public void setJobSubmissionInterfaceId(String jobSubmissionInterfaceId) {
-		this.jobSubmissionInterfaceId=jobSubmissionInterfaceId;
-	}
-	
-	public void setAlternativeSshHostname(String alternativeSshHostname) {
-		this.alternativeSshHostname=alternativeSshHostname;
-	}
-	
-	public void setSecurityProtocol(String securityProtocol) {
-		this.securityProtocol=securityProtocol;
-	}
-	
-	public void setSshPort(int sshPort) {
-		this.sshPort=sshPort;
-	}
-
-    public String getMonitorMode() {
-        return monitorMode;
-    }
-
-    public void setMonitorMode(String monitorMode) {
-        this.monitorMode = monitorMode;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/ec8c6202/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/UnicoreDataMovement.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/UnicoreDataMovement.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/UnicoreDataMovement.java
deleted file mode 100644
index a39821f..0000000
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/UnicoreDataMovement.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-package org.apache.aiaravata.application.catalog.data.model;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-@Entity
-@Table(name = "UNICORE_DATAMOVEMENT")
-public class UnicoreDataMovement {
-	@Id
-    @Column(name = "DATAMOVEMENT_ID")
-    private String dataMovementId;
-    @Column(name = "SECURITY_PROTOCAL")
-    private String securityProtocol;
-
-    @Column(name = "UNICORE_ENDPOINT_URL")
-    private String unicoreEndpointUrl;
-
-    public String getUnicoreEndpointUrl() {
-		return unicoreEndpointUrl;
-	}
-
-    public void setUnicoreEndpointUrl(String unicoreEndpointUrl) {
-		this.unicoreEndpointUrl = unicoreEndpointUrl;
-	}
-
-    public String getDataMovementId() {
-        return dataMovementId;
-    }
-
-    public void setDataMovementId(String dataMovementId) {
-        this.dataMovementId = dataMovementId;
-    }
-
-    public String getSecurityProtocol() {
-        return securityProtocol;
-    }
-
-    public void setSecurityProtocol(String securityProtocol) {
-        this.securityProtocol = securityProtocol;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/ec8c6202/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/UnicoreJobSubmission.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/UnicoreJobSubmission.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/UnicoreJobSubmission.java
deleted file mode 100644
index 3655620..0000000
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/UnicoreJobSubmission.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-package org.apache.aiaravata.application.catalog.data.model;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-@Entity
-@Table(name = "UNICORE_SUBMISSION")
-public class UnicoreJobSubmission {
-	@Id
-    @Column(name = "SUBMISSION_ID")
-    private String submissionID;
-    @Column(name = "SECURITY_PROTOCAL")
-    private String securityProtocol;
-
-    @Column(name = "UNICORE_ENDPOINT_URL")
-    private String unicoreEndpointUrl;
-    
-    public String getUnicoreEndpointUrl() {
-		return unicoreEndpointUrl;
-	}
-
-    public void setUnicoreEndpointUrl(String unicoreEndpointUrl) {
-		this.unicoreEndpointUrl = unicoreEndpointUrl;
-	}
-    
-    
-	public String getSubmissionID() {
-        return submissionID;
-    }
-
-    public void setSubmissionID(String submissionID) {
-        this.submissionID = submissionID;
-    }
-
-    public String getSecurityProtocol() {
-        return securityProtocol;
-    }
-
-    public void setSecurityProtocol(String securityProtocol) {
-        this.securityProtocol = securityProtocol;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/ec8c6202/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/Workflow.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/Workflow.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/Workflow.java
deleted file mode 100644
index 910bd02..0000000
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/Workflow.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.aiaravata.application.catalog.data.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 {
-
-    @Column(name = "WF_NAME")
-    private String wfName;
-
-    @Column(name = "CREATED_USER")
-    private String createdUser;
-
-    @Lob
-    @Column(name = "GRAPH")
-    private char[] graph;
-
-    @Id
-    @Column(name = "WF_TEMPLATE_ID")
-    private String wfTemplateId;
-
-    @Column(name = "CREATION_TIME")
-    private Timestamp creationTime;
-
-    @Column(name = "UPDATE_TIME")
-    private Timestamp updateTime;
-
-    @Lob
-    @Column(name = "IMAGE")
-    private byte[] image;
-
-    @Column(name = "GATEWAY_ID")
-    private String gatewayId;
-
-    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 Timestamp getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Timestamp updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getWfName() {
-        return wfName;
-    }
-
-    public String getCreatedUser() {
-        return createdUser;
-    }
-
-    public char[] getGraph() {
-        return graph;
-    }
-
-    public String getWfTemplateId() {
-        return wfTemplateId;
-    }
-
-    public void setWfName(String wfName) {
-        this.wfName=wfName;
-    }
-
-    public void setCreatedUser(String createdUser) {
-        this.createdUser=createdUser;
-    }
-
-    public void setGraph(char[] graph) {
-        this.graph=graph;
-    }
-
-    public void setWfTemplateId(String wfTemplateId) {
-        this.wfTemplateId=wfTemplateId;
-    }
-
-    public byte[] getImage() {
-        return image;
-    }
-
-    public void setImage(byte[] image) {
-        this.image = image;
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/ec8c6202/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/WorkflowInput.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/WorkflowInput.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/WorkflowInput.java
deleted file mode 100644
index 7ec659f..0000000
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/WorkflowInput.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.aiaravata.application.catalog.data.model;
-
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "WORKFLOW_INPUT")
-@IdClass(WorkflowInput_PK.class)
-public class WorkflowInput implements Serializable {
-    @Id
-    @Column(name = "WF_TEMPLATE_ID")
-    private String wfTemplateId;
-    @Id
-    @Column(name = "INPUT_KEY")
-    private String inputKey;
-    @Lob
-    @Column(name = "INPUT_VALUE")
-    private char[] inputVal;
-    @Column(name = "DATA_TYPE")
-    private String dataType;
-    @Column(name = "METADATA")
-    private String metadata;
-    @Column(name = "APP_ARGUMENT")
-    private String appArgument;
-    @Column(name = "USER_FRIENDLY_DESC")
-    private String userFriendlyDesc;
-    @Column(name = "STANDARD_INPUT")
-    private boolean standardInput;
-    @Column(name = "INPUT_ORDER")
-    private int inputOrder;
-    @Column(name="IS_REQUIRED")
-    private boolean isRequired;
-    @Column(name="REQUIRED_TO_COMMANDLINE")
-    private boolean requiredToCMD;
-    @Column(name = "DATA_STAGED")
-    private boolean dataStaged;
-
-    @ManyToOne(cascade = CascadeType.MERGE)
-    @JoinColumn(name = "WF_TEMPLATE_ID")
-    private Workflow workflow;
-
-    public String getWfTemplateId() {
-        return wfTemplateId;
-    }
-
-    public void setWfTemplateId(String wfTemplateId) {
-        this.wfTemplateId = wfTemplateId;
-    }
-
-    public String getInputKey() {
-        return inputKey;
-    }
-
-    public void setInputKey(String inputKey) {
-        this.inputKey = inputKey;
-    }
-
-    public char[] getInputVal() {
-        return inputVal;
-    }
-
-    public void setInputVal(char[] inputVal) {
-        this.inputVal = inputVal;
-    }
-
-    public String getDataType() {
-        return dataType;
-    }
-
-    public void setDataType(String dataType) {
-        this.dataType = dataType;
-    }
-
-    public String getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(String metadata) {
-        this.metadata = metadata;
-    }
-
-    public String getAppArgument() {
-        return appArgument;
-    }
-
-    public void setAppArgument(String appArgument) {
-        this.appArgument = appArgument;
-    }
-
-    public String getUserFriendlyDesc() {
-        return userFriendlyDesc;
-    }
-
-    public void setUserFriendlyDesc(String userFriendlyDesc) {
-        this.userFriendlyDesc = userFriendlyDesc;
-    }
-
-    public Workflow getWorkflow() {
-        return workflow;
-    }
-
-    public void setWorkflow(Workflow workflow) {
-        this.workflow = workflow;
-    }
-
-    public boolean isStandardInput() {
-        return standardInput;
-    }
-
-    public void setStandardInput(boolean standardInput) {
-        this.standardInput = standardInput;
-    }
-
-    public int getInputOrder() {
-        return inputOrder;
-    }
-
-    public void setInputOrder(int inputOrder) {
-        this.inputOrder = inputOrder;
-    }
-
-    public boolean isRequired() {
-        return isRequired;
-    }
-
-    public void setRequired(boolean isRequired) {
-        this.isRequired = isRequired;
-    }
-
-    public boolean isRequiredToCMD() {
-        return requiredToCMD;
-    }
-
-    public void setRequiredToCMD(boolean requiredToCMD) {
-        this.requiredToCMD = requiredToCMD;
-    }
-
-    public boolean isDataStaged() {
-        return dataStaged;
-    }
-
-    public void setDataStaged(boolean dataStaged) {
-        this.dataStaged = dataStaged;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/ec8c6202/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/WorkflowInput_PK.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/WorkflowInput_PK.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/WorkflowInput_PK.java
deleted file mode 100644
index e84f572..0000000
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/WorkflowInput_PK.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.aiaravata.application.catalog.data.model;
-
-import java.io.Serializable;
-
-public class WorkflowInput_PK implements Serializable {
-    private String wfTemplateId;
-    private String inputKey;
-
-    public WorkflowInput_PK(String wfTemplateId, String inputKey) {
-        this.wfTemplateId = wfTemplateId;
-        this.inputKey = inputKey;
-    }
-
-    public WorkflowInput_PK() {
-        ;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return false;
-    }
-
-    @Override
-    public int hashCode() {
-        return 1;
-    }
-
-    public String getWfTemplateId() {
-        return wfTemplateId;
-    }
-
-    public void setWfTemplateId(String wfTemplateId) {
-        this.wfTemplateId = wfTemplateId;
-    }
-
-    public String getInputKey() {
-        return inputKey;
-    }
-
-    public void setInputKey(String inputKey) {
-        this.inputKey = inputKey;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/ec8c6202/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/WorkflowOutput.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/WorkflowOutput.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/WorkflowOutput.java
deleted file mode 100644
index 8343a48..0000000
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/WorkflowOutput.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.aiaravata.application.catalog.data.model;
-
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "WORKFLOW_OUTPUT")
-@IdClass(WorkflowOutput_PK.class)
-public class WorkflowOutput implements Serializable {
-    @Id
-    @Column(name = "WF_TEMPLATE_ID")
-    private String wfTemplateId;
-    @Id
-    @Column(name = "OUTPUT_KEY")
-    private String outputKey;
-    @Lob
-    @Column(name = "OUTPUT_VALUE")
-    private char[] outputVal;
-    @Column(name = "DATA_TYPE")
-    private String dataType;
-    @Column(name = "VALIDITY_TYPE")
-    private String validityType;
-    @Column(name = "DATA_MOVEMENT")
-    private boolean dataMovement;
-    @Column(name = "DATA_NAME_LOCATION")
-    private String dataNameLocation;
-
-    @ManyToOne(cascade= CascadeType.MERGE)
-    @JoinColumn(name = "WF_TEMPLATE_ID")
-    private Workflow workflow;
-
-    public String getWfTemplateId() {
-        return wfTemplateId;
-    }
-
-    public void setWfTemplateId(String wfTemplateId) {
-        this.wfTemplateId = wfTemplateId;
-    }
-
-    public String getDataType() {
-        return dataType;
-    }
-
-    public void setDataType(String dataType) {
-        this.dataType = dataType;
-    }
-
-    public Workflow getWorkflow() {
-        return workflow;
-    }
-
-    public void setWorkflow(Workflow workflow) {
-        this.workflow = workflow;
-    }
-
-    public String getOutputKey() {
-        return outputKey;
-    }
-
-    public void setOutputKey(String outputKey) {
-        this.outputKey = outputKey;
-    }
-
-    public char[] getOutputVal() {
-        return outputVal;
-    }
-
-    public void setOutputVal(char[] outputVal) {
-        this.outputVal = outputVal;
-    }
-
-    public String getValidityType() {
-        return validityType;
-    }
-
-    public void setValidityType(String validityType) {
-        this.validityType = validityType;
-    }
-
-    public boolean isDataMovement() {
-        return dataMovement;
-    }
-
-    public void setDataMovement(boolean dataMovement) {
-        this.dataMovement = dataMovement;
-    }
-
-    public String getDataNameLocation() {
-        return dataNameLocation;
-    }
-
-    public void setDataNameLocation(String dataNameLocation) {
-        this.dataNameLocation = dataNameLocation;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/ec8c6202/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/WorkflowOutput_PK.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/WorkflowOutput_PK.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/WorkflowOutput_PK.java
deleted file mode 100644
index 4439340..0000000
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/WorkflowOutput_PK.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.aiaravata.application.catalog.data.model;
-
-import java.io.Serializable;
-
-public class WorkflowOutput_PK implements Serializable {
-    private String wfTemplateId;
-    private String outputKey;
-
-    public WorkflowOutput_PK(String wfTemplateId, String outputKey) {
-        this.wfTemplateId = wfTemplateId;
-        this.outputKey = outputKey;
-    }
-
-    public WorkflowOutput_PK() {
-        ;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return false;
-    }
-
-    @Override
-    public int hashCode() {
-        return 1;
-    }
-
-    public String getWfTemplateId() {
-        return wfTemplateId;
-    }
-
-    public void setWfTemplateId(String wfTemplateId) {
-        this.wfTemplateId = wfTemplateId;
-    }
-
-    public String getOutputKey() {
-        return outputKey;
-    }
-
-    public void setOutputKey(String outputKey) {
-        this.outputKey = outputKey;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/ec8c6202/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AbstractResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AbstractResource.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AbstractResource.java
deleted file mode 100644
index e1b042d..0000000
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AbstractResource.java
+++ /dev/null
@@ -1,382 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.aiaravata.application.catalog.data.resources;
-
-public abstract class AbstractResource implements Resource {
-    // table names
-	public static final String COMPUTE_RESOURCE = "ComputeResource";
-	public static final String HOST_ALIAS = "HostAlias";
-    public static final String HOST_IPADDRESS = "HostIPAddress";
-    public static final String GSISSH_SUBMISSION = "GSISSHSubmission";
-    public static final String GSISSH_EXPORT = "GSISSHExport";
-    public static final String PRE_JOBCOMMAND = "PreJobCommand";
-    public static final String POST_JOBCOMMAND = "PostJobCommand";
-    public static final String GLOBUS_SUBMISSION = "GlobusJobSubmission";
-    public static final String UNICORE_JOB_SUBMISSION = "UnicoreJobSubmission";
-    public static final String UNICORE_DATA_MOVEMENT = "UnicoreDataMovement";
-    public static final String GLOBUS_GK_ENDPOINT = "GlobusGKEndpoint";
-    public static final String SSH_SUBMISSION = "SSHSubmission";
-	public static final String SCP_DATA_MOVEMENT = "ScpDataMovement";
-	public static final String GRIDFTP_DATA_MOVEMENT = "GridftpDataMovement";
-	public static final String GRIDFTP_ENDPOINT = "GridftpEndpoint";
-	public static final String JOB_SUBMISSION_PROTOCOL = "JobSubmissionProtocol";
-    public static final String DATA_MOVEMENT_PROTOCOL = "DataMovementProtocol";
-    public static final String APPLICATION_MODULE = "ApplicationModule";
-    public static final String APPLICATION_DEPLOYMENT = "ApplicationDeployment";
-    public static final String LIBRARY_PREPAND_PATH = "LibraryPrepandPath";
-    public static final String LIBRARY_APEND_PATH = "LibraryApendPath";
-    public static final String APP_ENVIRONMENT = "AppEnvironment";
-    public static final String APPLICATION_INTERFACE = "ApplicationInterface";
-    public static final String APP_MODULE_MAPPING = "AppModuleMapping";
-    public static final String APPLICATION_INPUT = "ApplicationInput";
-    public static final String WORKFLOW_INPUT = "WorkflowInput";
-    public static final String APPLICATION_OUTPUT = "ApplicationOutput";
-    public static final String WORKFLOW_OUTPUT = "WorkflowOutput";
-    public static final String GATEWAY_PROFILE = "GatewayProfile";
-    public static final String COMPUTE_RESOURCE_PREFERENCE = "ComputeResourcePreference";
-	public static final String BATCH_QUEUE = "BatchQueue";
-	public static final String COMPUTE_RESOURCE_FILE_SYSTEM = "ComputeResourceFileSystem";
-	public static final String JOB_SUBMISSION_INTERFACE = "JobSubmissionInterface";
-	public static final String DATA_MOVEMENT_INTERFACE = "DataMovementInterface";
-	public static final String RESOURCE_JOB_MANAGER = "ResourceJobManager";
-	public static final String JOB_MANAGER_COMMAND = "JobManagerCommand";
-	public static final String LOCAL_SUBMISSION = "LocalSubmission";
-	public static final String LOCAL_DATA_MOVEMENT = "LocalDataMovement";
-	public static final String SSH_JOB_SUBMISSION = "SshJobSubmission";
-	public static final String EMAIL_PROPERTY = "EmailMonitorProperty";
-    public static final String CLOUD_JOB_SUBMISSION = "CloudJobSubmission";
-    public static final String MODULE_LOAD_CMD = "ModuleLoadCmd";
-    public static final String WORKFLOW = "Workflow";
-
-    public final class EmailMonitorPropertyConstants {
-        public static final String JOB_SUBMISSION_INTERFACE_ID = "jobSubmissionId";
-    }
-
-	// Compute Resource Table
-	public final class ComputeResourceConstants {
-		public static final String RESOURCE_DESCRIPTION = "resourceDescription";
-		public static final String RESOURCE_ID = "resourceId";
-		public static final String HOST_NAME = "hostName";
-	}
-
-    // Host Alias Table
-    public final class HostAliasConstants {
-        public static final String RESOURCE_ID = "resourceID";
-        public static final String ALIAS = "alias";
-    }
-
-    // Host IPAddress Table
-    public final class HostIPAddressConstants {
-        public static final String RESOURCE_ID = "resourceID";
-        public static final String IP_ADDRESS = "ipaddress";
-    }
-
-    // GSSISSH Submission Table
-    public final class GSISSHSubmissionConstants {
-        public static final String SUBMISSION_ID = "submissionID";
-        public static final String RESOURCE_JOB_MANAGER = "resourceJobManager";
-        public static final String SSH_PORT = "sshPort";
-        public static final String INSTALLED_PATH = "installedPath";
-        public static final String MONITOR_MODE = "monitorMode";
-    }
-
-    // GSSISSH Export Table
-    public final class GSISSHExportConstants {
-        public static final String SUBMISSION_ID = "submissionID";
-        public static final String EXPORT = "export";
-    }
-
-    // GSSISSH Pre Job Command Table
-    public final class PreJobCommandConstants {
-        public static final String DEPLOYMENT_ID = "deploymentId";
-        public static final String COMMAND = "command";
-    }
-
-    // GSSISSH Post Job Command Table
-    public final class PostJobCommandConstants {
-        public static final String DEPLOYMENT_ID = "deploymentId";
-        public static final String COMMAND = "command";
-    }
-
-    // GSSISSH Post Job Command Table
-    public final class GlobusJobSubmissionConstants {
-        public static final String SUBMISSION_ID = "submissionID";
-        public static final String RESOURCE_JOB_MANAGER = "resourceJobManager";
-        public static final String SECURITY_PROTOCAL = "securityProtocol";
-        public static final String GLOBUS_GATEKEEPER_EP = "globusEP";
-    }
-
-    // Unicore Post Job Command Table
-    public final class UnicoreJobSubmissionConstants {
-        public static final String SUBMISSION_ID = "submissionID";
-        public static final String SECURITY_PROTOCAL = "securityProtocol";
-        public static final String UNICORE_ENDPOINT_URL = "unicoreEndpointUrl";
-        
-    }
-
-    public final class UnicoreDataMovementConstants {
-        public static final String DATAMOVEMENT_ID = "dataMovementId";
-        public static final String SECURITY_PROTOCAL = "securityProtocol";
-        public static final String UNICORE_ENDPOINT_URL = "unicoreEndpointUrl";
-    }
-
-    
-    public final class GlobusEPConstants{
-        public static final String SUBMISSION_ID = "submissionID";
-        public static final String ENDPOINT = "endpoint";
-    }
-
-    // GSSISSH Post Job Command Table
-    public final class SSHSubmissionConstants {
-        public static final String SUBMISSION_ID = "submissionID";
-        public static final String RESOURCE_JOB_MANAGER = "resourceJobManager";
-        public static final String SSH_PORT = "sshPort";
-    }
-
-	// Scp Data Movement Table
-	public final class ScpDataMovementConstants {
-		public static final String QUEUE_DESCRIPTION = "queueDescription";
-		public static final String DATA_MOVEMENT_INTERFACE_ID = "dataMovementInterfaceId";
-		public static final String SECURITY_PROTOCOL = "securityProtocol";
-		public static final String ALTERNATIVE_SCP_HOSTNAME = "alternativeScpHostname";
-		public static final String SSH_PORT = "sshPort";
-	}
-
-    public final class GridFTPDataMovementConstants {
-        public static final String DATA_MOVE_ID = "dataMoveID";
-        public static final String SECURITY_PROTOCOL = "securityProtocol";
-        public static final String GRID_FTP_EP = "gridFTPEP";
-    }
-
-    public final class GridFTPDMEPConstants{
-        public static final String DATA_MOVE_ID = "dataMoveId";
-        public static final String ENDPOINT = "endpoint";
-    }
-
-    public final class JobSubmissionProtocolConstants {
-        public static final String RESOURCE_ID = "resourceID";
-        public static final String SUBMISSION_ID = "submissionID";
-        public static final String JOB_TYPE = "jobType";
-    }
-
-    public final class DataMoveProtocolConstants {
-        public static final String RESOURCE_ID = "resourceID";
-        public static final String DATA_MOVE_ID = "dataMoveID";
-        public static final String DATA_MOVE_TYPE = "dataMoveType";
-    }
-
-    public final class ApplicationModuleConstants {
-        public static final String MODULE_ID = "moduleID";
-        public static final String GATEWAY_ID = "gatewayId";
-        public static final String MODULE_NAME = "moduleName";
-        public static final String MODULE_VERSION = "moduleVersion";
-        public static final String MODULE_DESC = "moduleDesc";
-    }
-
-    public final class ApplicationDeploymentConstants {
-        public static final String APP_MODULE_ID = "appModuleID";
-        public static final String DEPLOYMENT_ID = "deploymentID";
-        public static final String COMPUTE_HOST_ID = "hostID";
-        public static final String GATEWAY_ID = "gatewayId";
-        public static final String EXECUTABLE_PATH = "executablePath";
-        public static final String APPLICATION_DESC = "applicationDesc";
-        public static final String ENV_MODULE_LOAD_CMD = "envModuleLoaString";
-        public static final String PARALLELISM = "parallelism";
-    }
-
-    public final class LibraryPrepandPathConstants {
-        public static final String DEPLOYMENT_ID = "deploymentID";
-        public static final String NAME = "name";
-        public static final String VALUE = "value";
-    }
-
-    public final class LibraryApendPathConstants {
-        public static final String DEPLOYMENT_ID = "deploymentID";
-        public static final String NAME = "name";
-        public static final String VALUE = "value";
-    }
-
-    public final class AppEnvironmentConstants {
-        public static final String DEPLOYMENT_ID = "deploymentID";
-        public static final String NAME = "name";
-        public static final String VALUE = "value";
-    }
-
-    public final class ApplicationInterfaceConstants {
-        public static final String INTERFACE_ID = "interfaceID";
-        public static final String APPLICATION_NAME = "appName";
-        public static final String GATEWAY_ID = "gatewayId";
-    }
-
-    public final class AppModuleMappingConstants {
-        public static final String INTERFACE_ID = "interfaceID";
-        public static final String MODULE_ID = "moduleID";
-    }
-
-    public final class AppInputConstants {
-        public static final String INTERFACE_ID = "interfaceID";
-        public static final String INPUT_KEY = "inputKey";
-        public static final String INPUT_VALUE = "inputVal";
-        public static final String DATA_TYPE = "dataType";
-        public static final String METADATA = "metadata";
-        public static final String APP_ARGUMENT = "appArgument";
-        public static final String USER_FRIENDLY_DESC = "userFriendlyDesc";
-        public static final String STANDARD_INPUT = "standardInput";
-    }
-
-    public final class AppOutputConstants {
-        public static final String INTERFACE_ID = "interfaceID";
-        public static final String OUTPUT_KEY = "outputKey";
-        public static final String OUTPUT_VALUE = "outputVal";
-        public static final String DATA_TYPE = "dataType";
-    }
-
-    public final class WFInputConstants {
-        public static final String WF_TEMPLATE_ID = "wfTemplateId";
-        public static final String INPUT_KEY = "inputKey";
-        public static final String INPUT_VALUE = "inputVal";
-        public static final String DATA_TYPE = "dataType";
-        public static final String METADATA = "metadata";
-        public static final String APP_ARGUMENT = "appArgument";
-        public static final String USER_FRIENDLY_DESC = "userFriendlyDesc";
-        public static final String STANDARD_INPUT = "standardInput";
-    }
-
-    public final class WFOutputConstants {
-        public static final String WF_TEMPLATE_ID = "wfTemplateId";
-        public static final String OUTPUT_KEY = "outputKey";
-        public static final String OUTPUT_VALUE = "outputVal";
-        public static final String DATA_TYPE = "dataType";
-    }
-
-    public final class GatewayProfileConstants {
-        public static final String GATEWAY_ID = "gatewayID";
-        public static final String GATEWAY_DESC = "gatewayDesc";
-    }
-
-    public final class ComputeResourcePreferenceConstants {
-        public static final String GATEWAY_ID = "gatewayId";
-        public static final String RESOURCE_ID = "resourceId";
-        public static final String OVERRIDE_BY_AIRAVATA = "overrideByAiravata";
-        public static final String PREFERED_JOB_SUB_PROTOCOL = "preferedJobSubmissionProtocol";
-        public static final String PREFERED_DATA_MOVE_PROTOCOL = "preferedDataMoveProtocol";
-        public static final String PREFERED_BATCH_QUEUE = "batchQueue";
-        public static final String SCRATCH_LOCATION = "scratchLocation";
-        public static final String ALLOCATION_PROJECT_NUMBER = "projectNumber";
-    }
-
-    // Batch Queue Table
- 	public final class BatchQueueConstants {
- 		public static final String COMPUTE_RESOURCE_ID = "computeResourceId";
- 		public static final String MAX_RUNTIME = "maxRuntime";
- 		public static final String MAX_JOB_IN_QUEUE = "maxJobInQueue";
- 		public static final String QUEUE_DESCRIPTION = "queueDescription";
- 		public static final String QUEUE_NAME = "queueName";
- 		public static final String MAX_PROCESSORS = "maxProcessors";
- 		public static final String MAX_NODES = "maxNodes";
- 	}
- 	
-	// Compute Resource File System Table
-	public final class ComputeResourceFileSystemConstants {
-		public static final String COMPUTE_RESOURCE_ID = "computeResourceId";
-		public static final String PATH = "path";
-		public static final String FILE_SYSTEM = "fileSystem";
-	}
-	
-	// Job Submission Interface Table
-	public final class JobSubmissionInterfaceConstants {
-		public static final String JOB_SUBMISSION_INTERFACE_ID = "jobSubmissionInterfaceId";
-		public static final String COMPUTE_RESOURCE_ID = "computeResourceId";
-		public static final String JOB_SUBMISSION_PROTOCOL = "jobSubmissionProtocol";
-		public static final String PRIORITY_ORDER = "priorityOrder";
-	}
-	
-	// Data Movement Interface Table
-	public final class DataMovementInterfaceConstants {
-		public static final String COMPUTE_RESOURCE_ID = "computeResourceId";
-		public static final String DATA_MOVEMENT_PROTOCOL = "dataMovementProtocol";
-		public static final String DATA_MOVEMENT_INTERFACE_ID = "dataMovementInterfaceId";
-		public static final String PRIORITY_ORDER = "priorityOrder";
-	}
-	
-	// Resource Job Manager Table
-	public final class ResourceJobManagerConstants {
-		public static final String RESOURCE_JOB_MANAGER_ID = "resourceJobManagerId";
-		public static final String PUSH_MONITORING_ENDPOINT = "pushMonitoringEndpoint";
-		public static final String JOB_MANAGER_BIN_PATH = "jobManagerBinPath";
-		public static final String RESOURCE_JOB_MANAGER_TYPE = "resourceJobManagerType";
-	}
-	
-	// Job Manager Command Table
-	public final class JobManagerCommandConstants {
-		public static final String RESOURCE_JOB_MANAGER_ID = "resourceJobManagerId";
-		public static final String COMMAND_TYPE = "commandType";
-		public static final String COMMAND = "command";
-	}
-	
-	// Gridftp Data Movement Table
-	public final class GridftpDataMovementConstants {
-		public static final String DATA_MOVEMENT_INTERFACE_ID = "dataMovementInterfaceId";
-		public static final String SECURITY_PROTOCOL = "securityProtocol";
-	}
-	
-	// Gridftp Endpoint Table
-	public final class GridftpEndpointConstants {
-		public static final String ENDPOINT = "endpoint";
-		public static final String DATA_MOVEMENT_INTERFACE_ID = "dataMovementInterfaceId";
-	}
-	
-	// Local Submission Table
-	public final class LocalSubmissionConstants {
-		public static final String RESOURCE_JOB_MANAGER_ID = "resourceJobManagerId";
-		public static final String JOB_SUBMISSION_INTERFACE_ID = "jobSubmissionInterfaceId";
-	}
-	
-	// Local Data Movement Table
-	public final class LocalDataMovementConstants {
-		public static final String DATA_MOVEMENT_INTERFACE_ID = "dataMovementInterfaceId";
-	}
-	
-	// Ssh Job Submission Table
-	public final class SshJobSubmissionConstants {
-		public static final String RESOURCE_JOB_MANAGER_ID = "resourceJobManagerId";
-		public static final String JOB_SUBMISSION_INTERFACE_ID = "jobSubmissionInterfaceId";
-		public static final String ALTERNATIVE_SSH_HOSTNAME = "alternativeSshHostname";
-		public static final String SECURITY_PROTOCOL = "securityProtocol";
-		public static final String SSH_PORT = "sshPort";
-	}
-
-    // Module Load Cmd Table
-    public final class ModuleLoadCmdConstants {
-        public static final String CMD = "cmd";
-        public static final String APP_DEPLOYMENT_ID = "appDeploymentId";
-    }
-
-    // Workflow Table
-    public final class WorkflowConstants {
-        public static final String WF_NAME = "wfName";
-        public static final String CREATED_USER = "createdUser";
-        public static final String GRAPH = "graph";
-        public static final String WF_TEMPLATE_ID = "wfTemplateId";
-        public static final String GATEWAY_ID = "gatewayId";
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/ec8c6202/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppDeploymentResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppDeploymentResource.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppDeploymentResource.java
deleted file mode 100644
index a635666..0000000
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppDeploymentResource.java
+++ /dev/null
@@ -1,446 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.aiaravata.application.catalog.data.resources;
-
-import org.airavata.appcatalog.cpi.AppCatalogException;
-import org.apache.aiaravata.application.catalog.data.model.ApplicationDeployment;
-import org.apache.aiaravata.application.catalog.data.model.ApplicationModule;
-import org.apache.aiaravata.application.catalog.data.model.ComputeResource;
-import org.apache.aiaravata.application.catalog.data.util.AppCatalogJPAUtils;
-import org.apache.aiaravata.application.catalog.data.util.AppCatalogQueryGenerator;
-import org.apache.aiaravata.application.catalog.data.util.AppCatalogResourceType;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
-import org.apache.airavata.common.utils.AiravataUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.List;
-
-public class AppDeploymentResource extends AbstractResource {
-    private final static Logger logger = LoggerFactory.getLogger(AppDeploymentResource.class);
-    private String deploymentId;
-    private String appModuleId;
-    private String hostId;
-    private String executablePath;
-    private String parallelism;
-    private String appDes;
-    private String gatewayId;
-    private ComputeResourceResource hostResource;
-    private AppModuleResource moduleResource;
-    private Timestamp createdTime;
-    private Timestamp updatedTime;
-
-    public String getGatewayId() {
-        return gatewayId;
-    }
-
-    public void setGatewayId(String gatewayId) {
-        this.gatewayId = gatewayId;
-    }
-
-    public Timestamp getCreatedTime() {
-        return createdTime;
-    }
-
-    public void setCreatedTime(Timestamp createdTime) {
-        this.createdTime = createdTime;
-    }
-
-    public Timestamp getUpdatedTime() {
-        return updatedTime;
-    }
-
-    public void setUpdatedTime(Timestamp updatedTime) {
-        this.updatedTime = updatedTime;
-    }
-
-    public String getDeploymentId() {
-        return deploymentId;
-    }
-
-    public void setDeploymentId(String deploymentId) {
-        this.deploymentId = deploymentId;
-    }
-
-    public String getAppModuleId() {
-        return appModuleId;
-    }
-
-    public void setAppModuleId(String appModuleId) {
-        this.appModuleId = appModuleId;
-    }
-
-    public String getHostId() {
-        return hostId;
-    }
-
-    public void setHostId(String hostId) {
-        this.hostId = hostId;
-    }
-
-    public String getExecutablePath() {
-        return executablePath;
-    }
-
-    public void setExecutablePath(String executablePath) {
-        this.executablePath = executablePath;
-    }
-
-    public String getAppDes() {
-        return appDes;
-    }
-
-    public void setAppDes(String appDes) {
-        this.appDes = appDes;
-    }
-
-    public ComputeResourceResource getHostResource() {
-        return hostResource;
-    }
-
-    public void setHostResource(ComputeResourceResource hostResource) {
-        this.hostResource = hostResource;
-    }
-
-    public AppModuleResource getModuleResource() {
-        return moduleResource;
-    }
-
-    public void setModuleResource(AppModuleResource moduleResource) {
-        this.moduleResource = moduleResource;
-    }
-
-    @Override
-    public void remove(Object identifier) throws AppCatalogException {
-        EntityManager em = null;
-        try {
-            em = AppCatalogJPAUtils.getEntityManager();
-            em.getTransaction().begin();
-            AppCatalogQueryGenerator generator= new AppCatalogQueryGenerator(APPLICATION_DEPLOYMENT);
-            generator.setParameter(ApplicationDeploymentConstants.DEPLOYMENT_ID, identifier);
-            Query q = generator.deleteQuery(em);
-            q.executeUpdate();
-            em.getTransaction().commit();
-            em.close();
-        } catch (ApplicationSettingsException e) {
-            logger.error(e.getMessage(), e);
-            throw new AppCatalogException(e);
-        } finally {
-            if (em != null && em.isOpen()) {
-                if (em.getTransaction().isActive()){
-                    em.getTransaction().rollback();
-                }
-                em.close();
-            }
-        }
-    }
-
-    @Override
-    public Resource get(Object identifier) throws AppCatalogException {
-        EntityManager em = null;
-        try {
-            em = AppCatalogJPAUtils.getEntityManager();
-            em.getTransaction().begin();
-            AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(APPLICATION_DEPLOYMENT);
-            generator.setParameter(ApplicationDeploymentConstants.DEPLOYMENT_ID, identifier);
-            Query q = generator.selectQuery(em);
-            ApplicationDeployment deployment = (ApplicationDeployment) q.getSingleResult();
-            AppDeploymentResource deploymentResource =
-                    (AppDeploymentResource) AppCatalogJPAUtils.getResource(AppCatalogResourceType.APPLICATION_DEPLOYMENT, deployment);
-            em.getTransaction().commit();
-            em.close();
-            return deploymentResource;
-        } catch (ApplicationSettingsException e) {
-            logger.error(e.getMessage(), e);
-            throw new AppCatalogException(e);
-        } finally {
-            if (em != null && em.isOpen()) {
-                if (em.getTransaction().isActive()) {
-                    em.getTransaction().rollback();
-                }
-                em.close();
-            }
-        }
-    }
-
-    @Override
-    public List<Resource> get(String fieldName, Object value) throws AppCatalogException {
-        List<Resource> appDeployments = new ArrayList<Resource>();
-        EntityManager em = null;
-        try {
-            em = AppCatalogJPAUtils.getEntityManager();
-            em.getTransaction().begin();
-            Query q;
-            AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(APPLICATION_DEPLOYMENT);
-            List results;
-            if (fieldName.equals(ApplicationDeploymentConstants.APP_MODULE_ID)) {
-                generator.setParameter(ApplicationDeploymentConstants.APP_MODULE_ID, value);
-                q = generator.selectQuery(em);
-                results = q.getResultList();
-                if (results.size() != 0) {
-                    for (Object result : results) {
-                        ApplicationDeployment deployment = (ApplicationDeployment) result;
-                        AppDeploymentResource deploymentResource =
-                                (AppDeploymentResource) AppCatalogJPAUtils.getResource(AppCatalogResourceType.APPLICATION_DEPLOYMENT, deployment);
-                        appDeployments.add(deploymentResource);
-                    }
-                }
-            } else if (fieldName.equals(ApplicationDeploymentConstants.COMPUTE_HOST_ID)) {
-                generator.setParameter(ApplicationDeploymentConstants.COMPUTE_HOST_ID, value);
-                q = generator.selectQuery(em);
-                results = q.getResultList();
-                if (results.size() != 0) {
-                    for (Object result : results) {
-                        ApplicationDeployment deployment = (ApplicationDeployment) result;
-                        AppDeploymentResource deploymentResource =
-                                (AppDeploymentResource) AppCatalogJPAUtils.getResource(AppCatalogResourceType.APPLICATION_DEPLOYMENT, deployment);
-                        appDeployments.add(deploymentResource);
-                    }
-                }
-            }else {
-                em.getTransaction().commit();
-                em.close();
-                logger.error("Unsupported field name for app deployment resource.", new IllegalArgumentException());
-                throw new IllegalArgumentException("Unsupported field name for app deployment resource.");
-            }
-            em.getTransaction().commit();
-            em.close();
-        } catch (Exception e) {
-            logger.error(e.getMessage(), e);
-            throw new AppCatalogException(e);
-        } finally {
-            if (em != null && em.isOpen()) {
-                if (em.getTransaction().isActive()) {
-                    em.getTransaction().rollback();
-                }
-                em.close();
-            }
-        }
-        return appDeployments;
-    }
-
-    @Override
-    public List<Resource> getAll() throws AppCatalogException {
-        List<Resource> appDeployments = new ArrayList<Resource>();
-        EntityManager em = null;
-        try {
-            em = AppCatalogJPAUtils.getEntityManager();
-            em.getTransaction().begin();
-            AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(APPLICATION_DEPLOYMENT);
-            generator.setParameter(ApplicationDeploymentConstants.GATEWAY_ID, gatewayId);
-            Query q = generator.selectQuery(em);
-            List results = q.getResultList();
-                if (results.size() != 0) {
-                    for (Object result : results) {
-                        ApplicationDeployment deployment = (ApplicationDeployment) result;
-                        AppDeploymentResource deploymentResource =
-                                (AppDeploymentResource) AppCatalogJPAUtils.getResource(AppCatalogResourceType.APPLICATION_DEPLOYMENT, deployment);
-                        appDeployments.add(deploymentResource);
-                    }
-                }
-            em.getTransaction().commit();
-            em.close();
-        } catch (Exception e) {
-            logger.error(e.getMessage(), e);
-            throw new AppCatalogException(e);
-        } finally {
-            if (em != null && em.isOpen()) {
-                if (em.getTransaction().isActive()) {
-                    em.getTransaction().rollback();
-                }
-                em.close();
-            }
-        }
-        return appDeployments;
-    }
-
-    @Override
-    public List<String> getAllIds() throws AppCatalogException {
-        List<String> appDeployments = new ArrayList<String>();
-        EntityManager em = null;
-        try {
-            em = AppCatalogJPAUtils.getEntityManager();
-            em.getTransaction().begin();
-            AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(APPLICATION_DEPLOYMENT);
-            Query q = generator.selectQuery(em);
-            List results = q.getResultList();
-            if (results.size() != 0) {
-                for (Object result : results) {
-                    ApplicationDeployment deployment = (ApplicationDeployment) result;
-                    appDeployments.add(deployment.getDeploymentID());
-                }
-            }
-            em.getTransaction().commit();
-            em.close();
-        } catch (Exception e) {
-            logger.error(e.getMessage(), e);
-            throw new AppCatalogException(e);
-        } finally {
-            if (em != null && em.isOpen()) {
-                if (em.getTransaction().isActive()) {
-                    em.getTransaction().rollback();
-                }
-                em.close();
-            }
-        }
-        return appDeployments;
-    }
-
-    @Override
-    public List<String> getIds(String fieldName, Object value) throws AppCatalogException {
-        List<String> appDeployments = new ArrayList<String>();
-        EntityManager em = null;
-        try {
-            em = AppCatalogJPAUtils.getEntityManager();
-            em.getTransaction().begin();
-            Query q;
-            AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(APPLICATION_DEPLOYMENT);
-            List results;
-            if (fieldName.equals(ApplicationDeploymentConstants.APP_MODULE_ID)) {
-                generator.setParameter(ApplicationDeploymentConstants.APP_MODULE_ID, value);
-                q = generator.selectQuery(em);
-                results = q.getResultList();
-                if (results.size() != 0) {
-                    for (Object result : results) {
-                        ApplicationDeployment deployment = (ApplicationDeployment) result;
-                        appDeployments.add(deployment.getDeploymentID());
-                    }
-                }
-            } else if (fieldName.equals(ApplicationDeploymentConstants.COMPUTE_HOST_ID)) {
-                generator.setParameter(ApplicationDeploymentConstants.COMPUTE_HOST_ID, value);
-                q = generator.selectQuery(em);
-                results = q.getResultList();
-                if (results.size() != 0) {
-                    for (Object result : results) {
-                        ApplicationDeployment deployment = (ApplicationDeployment) result;
-                        appDeployments.add(deployment.getDeploymentID());
-                    }
-                }
-            }else {
-                em.getTransaction().commit();
-                em.close();
-                logger.error("Unsupported field name for app deployment resource.", new IllegalArgumentException());
-                throw new IllegalArgumentException("Unsupported field name for app deployment resource.");
-            }
-            em.getTransaction().commit();
-            em.close();
-        } catch (Exception e) {
-            logger.error(e.getMessage(), e);
-            throw new AppCatalogException(e);
-        } finally {
-            if (em != null && em.isOpen()) {
-                if (em.getTransaction().isActive()) {
-                    em.getTransaction().rollback();
-                }
-                em.close();
-            }
-        }
-        return appDeployments;
-    }
-
-    @Override
-    public void save() throws AppCatalogException {
-        EntityManager em = null;
-        try {
-            em = AppCatalogJPAUtils.getEntityManager();
-            ApplicationDeployment existingDeployment = em.find(ApplicationDeployment.class, deploymentId);
-            em.close();
-
-            em = AppCatalogJPAUtils.getEntityManager();
-            em.getTransaction().begin();
-            ApplicationModule applicationModule = em.find(ApplicationModule.class, appModuleId);
-            ComputeResource computeHost = em.find(ComputeResource.class, hostId);
-            if (existingDeployment !=  null){
-                existingDeployment.setDeploymentID(deploymentId);
-                existingDeployment.setApplicationDesc(appDes);
-                existingDeployment.setAppModuleID(appModuleId);
-                existingDeployment.setApplicationModule(applicationModule);
-                existingDeployment.setComputeResource(computeHost);
-                existingDeployment.setHostID(hostId);
-                existingDeployment.setExecutablePath(executablePath);
-                existingDeployment.setParallelism(parallelism);
-                existingDeployment.setGatewayId(gatewayId);
-                existingDeployment.setUpdateTime(AiravataUtils.getCurrentTimestamp());
-                em.merge(existingDeployment);
-            }else {
-                ApplicationDeployment deployment  = new ApplicationDeployment();
-                deployment.setApplicationDesc(appDes);
-                deployment.setDeploymentID(deploymentId);
-                deployment.setAppModuleID(appModuleId);
-                deployment.setHostID(hostId);
-                deployment.setApplicationModule(applicationModule);
-                deployment.setComputeResource(computeHost);
-                deployment.setExecutablePath(executablePath);
-                deployment.setParallelism(parallelism);
-                deployment.setGatewayId(gatewayId);
-                deployment.setCreationTime(AiravataUtils.getCurrentTimestamp());
-                em.persist(deployment);
-            }
-            em.getTransaction().commit();
-            em.close();
-        } catch (Exception e) {
-            logger.error(e.getMessage(), e);
-            throw new AppCatalogException(e);
-        } finally {
-            if (em != null && em.isOpen()) {
-                if (em.getTransaction().isActive()){
-                    em.getTransaction().rollback();
-                }
-                em.close();
-            }
-        }
-
-    }
-
-    @Override
-    public boolean isExists(Object identifier) throws AppCatalogException {
-        EntityManager em = null;
-        try {
-            em = AppCatalogJPAUtils.getEntityManager();
-            ApplicationDeployment deployment = em.find(ApplicationDeployment.class, identifier);
-            em.close();
-            return deployment != null;
-        } catch (ApplicationSettingsException e) {
-            logger.error(e.getMessage(), e);
-            throw new AppCatalogException(e);
-        } finally {
-            if (em != null && em.isOpen()) {
-                if (em.getTransaction().isActive()){
-                    em.getTransaction().rollback();
-                }
-                em.close();
-            }
-        }
-    }
-
-	public String getParallelism() {
-		return parallelism;
-	}
-
-	public void setParallelism(String parallelism) {
-		this.parallelism = parallelism;
-	}
-}


Mime
View raw message