airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject [37/51] [abbrv] [partial] airavata git commit: registry refactoring
Date Thu, 04 Jun 2015 20:34:25 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/util/AppCatalogThriftConversion.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
deleted file mode 100644
index 123ae96..0000000
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
+++ /dev/null
@@ -1,800 +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.util;
-
-import org.airavata.appcatalog.cpi.AppCatalogException;
-import org.apache.aiaravata.application.catalog.data.resources.*;
-import org.apache.airavata.model.Workflow;
-import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription;
-import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule;
-import org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType;
-import org.apache.airavata.model.appcatalog.appdeployment.SetEnvPaths;
-import org.apache.airavata.model.appcatalog.appinterface.*;
-import org.apache.airavata.model.appcatalog.computeresource.*;
-import org.apache.airavata.model.appcatalog.computeresource.BatchQueue;
-import org.apache.airavata.model.appcatalog.computeresource.CloudJobSubmission;
-import org.apache.airavata.model.appcatalog.computeresource.DataMovementInterface;
-import org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand;
-import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionInterface;
-import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManager;
-import org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement;
-import org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission;
-import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference;
-import org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile;
-
-import java.util.*;
-
-public class AppCatalogThriftConversion {
-    public static ComputeResourceResource getComputeHostResource (ComputeResourceDescription description){
-        ComputeResourceResource resource = new ComputeResourceResource();
-        resource.setHostName(description.getHostName());
-        resource.setResourceDescription(description.getResourceDescription());
-        resource.setResourceId(description.getComputeResourceId());
-        resource.setMaxMemoryPerNode(description.getMaxMemoryPerNode());
-        return resource;
-    }
-
-    public static ComputeResourceDescription getComputeHostDescription (ComputeResourceResource resource) throws AppCatalogException {
-        ComputeResourceDescription description = new ComputeResourceDescription();
-        description.setComputeResourceId(resource.getResourceId());
-        description.setHostName(resource.getHostName());
-        description.setResourceDescription(resource.getResourceDescription());
-        description.setMaxMemoryPerNode(resource.getMaxMemoryPerNode());
-        HostAliasResource aliasResource = new HostAliasResource();
-        List<Resource> resources = aliasResource.get(AbstractResource.HostAliasConstants.RESOURCE_ID, resource.getResourceId());
-        if (resources != null && !resources.isEmpty()){
-            description.setHostAliases(getHostAliases(resources));
-        }
-        HostIPAddressResource ipAddressResource = new HostIPAddressResource();
-        List<Resource> ipAddresses = ipAddressResource.get(AbstractResource.HostIPAddressConstants.RESOURCE_ID, resource.getResourceId());
-        if (ipAddresses != null && !ipAddresses.isEmpty()){
-            description.setIpAddresses(getIpAddresses(ipAddresses));
-        }
-
-        BatchQueueResource bqResource = new BatchQueueResource();
-        List<Resource> batchQueues = bqResource.get(AbstractResource.BatchQueueConstants.COMPUTE_RESOURCE_ID, resource.getResourceId());
-        if (batchQueues != null && !batchQueues.isEmpty()){
-            description.setBatchQueues(getBatchQueues(batchQueues));
-        }
-        
-        ComputeResourceFileSystemResource fsResource = new ComputeResourceFileSystemResource();
-        List<Resource> fsList = fsResource.get(AbstractResource.ComputeResourceFileSystemConstants.COMPUTE_RESOURCE_ID, resource.getResourceId());
-        description.setFileSystems(new HashMap<FileSystems,String>());
-        if (fsList != null && !fsList.isEmpty()){
-        	for (Resource r : fsList) {
-        		ComputeResourceFileSystemResource rr=(ComputeResourceFileSystemResource)r;
-        		description.getFileSystems().put(FileSystems.valueOf(rr.getFileSystem()), rr.getPath());
-			}
-        }
-        
-        JobSubmissionInterfaceResource jsiResource = new JobSubmissionInterfaceResource();
-        List<Resource> hsiList = jsiResource.get(AbstractResource.JobSubmissionInterfaceConstants.COMPUTE_RESOURCE_ID, resource.getResourceId());
-        if (hsiList != null && !hsiList.isEmpty()){
-            description.setJobSubmissionInterfaces(getJobSubmissionInterfaces(hsiList));
-        }
-        
-        DataMovementInterfaceResource dmiResource = new DataMovementInterfaceResource();
-        List<Resource> dmiList = dmiResource.get(AbstractResource.DataMovementInterfaceConstants.COMPUTE_RESOURCE_ID, resource.getResourceId());
-        if (dmiList != null && !dmiList.isEmpty()){
-            description.setDataMovementInterfaces(getDataMovementInterfaces(dmiList));
-        }
-        return description;
-    }
-
-    public static  List<ComputeResourceDescription> getComputeDescriptionList (List<Resource> resources) throws AppCatalogException {
-        List<ComputeResourceDescription> list = new ArrayList<ComputeResourceDescription>();
-        for (Resource resource : resources){
-            list.add(getComputeHostDescription((ComputeResourceResource)resource));
-        }
-        return list;
-    }
-
-    public static List<String> getHostAliases (List<Resource> resources){
-        List<String> hostAliases = new ArrayList<String>();
-        for (Resource alias : resources){
-            hostAliases.add(((HostAliasResource)alias).getAlias());
-        }
-        return hostAliases;
-    }
-
-    public static List<String> getIpAddresses (List<Resource> resources){
-        List<String> hostIpAddresses = new ArrayList<String>();
-        for (Resource resource : resources){
-            hostIpAddresses.add(((HostIPAddressResource)resource).getIpaddress());
-        }
-        return hostIpAddresses;
-    }
-    
-    public static List<BatchQueue> getBatchQueues (List<Resource> resources){
-    	List<BatchQueue> batchQueues = new ArrayList<BatchQueue>();
-        for (Resource resource : resources){
-        	batchQueues.add(getBatchQueue((BatchQueueResource)resource));
-        }
-        return batchQueues;
-    }
-    
-    public static List<DataMovementInterface> getDataMovementInterfaces(List<Resource> resources){
-    	List<DataMovementInterface> dataMovementInterfaces = new ArrayList<DataMovementInterface>();
-        for (Resource resource : resources){
-        	dataMovementInterfaces.add(getDataMovementInterface((DataMovementInterfaceResource)resource));
-        }
-        return dataMovementInterfaces;
-    }
-    
-    public static DataMovementInterface getDataMovementInterface(DataMovementInterfaceResource resource){
-    	DataMovementInterface dmi = new DataMovementInterface();
-    	dmi.setDataMovementInterfaceId(resource.getDataMovementInterfaceId());
-    	dmi.setDataMovementProtocol(DataMovementProtocol.valueOf(resource.getDataMovementProtocol()));
-    	dmi.setPriorityOrder(resource.getPriorityOrder());
-        return dmi;
-    }
-    
-    public static DataMovementInterfaceResource getDataMovementInterface(DataMovementInterface resource){
-    	DataMovementInterfaceResource dmi = new DataMovementInterfaceResource();
-    	dmi.setDataMovementInterfaceId(resource.getDataMovementInterfaceId());
-    	dmi.setDataMovementProtocol(resource.getDataMovementProtocol().toString());
-    	dmi.setPriorityOrder(resource.getPriorityOrder());
-        return dmi;
-    }
-    
-    public static List<JobSubmissionInterface> getJobSubmissionInterfaces(List<Resource> resources){
-    	List<JobSubmissionInterface> jobSubmissionInterfaces = new ArrayList<JobSubmissionInterface>();
-        for (Resource resource : resources){
-        	jobSubmissionInterfaces.add(getJobSubmissionInterface((JobSubmissionInterfaceResource)resource));
-        }
-        return jobSubmissionInterfaces;
-    }
-    
-    public static JobSubmissionInterface getJobSubmissionInterface(JobSubmissionInterfaceResource resource){
-    	JobSubmissionInterface jsi = new JobSubmissionInterface();
-    	jsi.setJobSubmissionInterfaceId(resource.getJobSubmissionInterfaceId());
-    	jsi.setJobSubmissionProtocol(JobSubmissionProtocol.valueOf(resource.getJobSubmissionProtocol()));
-    	jsi.setPriorityOrder(resource.getPriorityOrder());
-        return jsi;
-    }
-    
-    public static JobSubmissionInterfaceResource getJobSubmissionInterface(JobSubmissionInterface resource){
-    	JobSubmissionInterfaceResource jsi = new JobSubmissionInterfaceResource();
-    	jsi.setJobSubmissionInterfaceId(resource.getJobSubmissionInterfaceId());
-    	jsi.setJobSubmissionProtocol(resource.getJobSubmissionProtocol().toString());
-    	jsi.setPriorityOrder(resource.getPriorityOrder());
-        return jsi;
-    }
-    
-    public static BatchQueue getBatchQueue(BatchQueueResource resource){
-    	BatchQueue batchQueue = new BatchQueue();
-    	batchQueue.setMaxJobsInQueue(resource.getMaxJobInQueue());
-    	batchQueue.setMaxNodes(resource.getMaxNodes());
-    	batchQueue.setMaxProcessors(resource.getMaxProcessors());
-    	batchQueue.setMaxRunTime(resource.getMaxRuntime());
-    	batchQueue.setMaxMemory(resource.getMaxMemory());
-    	batchQueue.setQueueDescription(resource.getQueueDescription());
-    	batchQueue.setQueueName(resource.getQueueName());
-        return batchQueue;
-    }
-
-    public static BatchQueueResource getBatchQueue(BatchQueue resource){
-    	BatchQueueResource batchQueue = new BatchQueueResource();
-    	batchQueue.setMaxJobInQueue(resource.getMaxJobsInQueue());
-    	batchQueue.setMaxNodes(resource.getMaxNodes());
-    	batchQueue.setMaxProcessors(resource.getMaxProcessors());
-    	batchQueue.setMaxRuntime(resource.getMaxRunTime());
-    	batchQueue.setQueueDescription(resource.getQueueDescription());
-    	batchQueue.setQueueName(resource.getQueueName());
-    	batchQueue.setMaxMemory(resource.getMaxMemory());
-        return batchQueue;
-    }
-    
-//    public static Map<String, JobSubmissionProtocol> getJobSubmissionProtocolList(List<Resource> resources){
-//       Map<String, JobSubmissionProtocol> protocols = new HashMap<String, JobSubmissionProtocol>();
-//        for (Resource resource : resources){
-//            JobSubmissionProtocolResource submission = (JobSubmissionProtocolResource) resource;
-//            protocols.put(submission.getSubmissionID(), JobSubmissionProtocol.valueOf(submission.getJobType()));
-//        }
-//        return protocols;
-//    }
-
-//    public static Map<String, DataMovementProtocol> getDataMoveProtocolList(List<Resource> resources){
-//        Map<String, DataMovementProtocol> protocols = new HashMap<String, DataMovementProtocol>();
-//        for (Resource resource : resources){
-//            DataMovementProtocolResource protocolResource = (DataMovementProtocolResource) resource;
-//            protocols.put(protocolResource.getDataMoveID(), DataMovementProtocol.valueOf(protocolResource.getDataMoveType()));
-//        }
-//        return protocols;
-//    }
-
-    public static SshJobSubmissionResource getSSHJobSubmission (SSHJobSubmission submission){
-    	SshJobSubmissionResource resource = new SshJobSubmissionResource();
-        resource.setAlternativeSshHostname(submission.getAlternativeSSHHostName());
-        resource.setJobSubmissionInterfaceId(submission.getJobSubmissionInterfaceId());
-        ResourceJobManagerResource resourceJobManager = getResourceJobManager(submission.getResourceJobManager());
-//        resourceJobManager.setResourceJobManagerId(submission.getJobSubmissionInterfaceId());
-        resource.setResourceJobManagerId(resourceJobManager.getResourceJobManagerId());
-        if (submission.getMonitorMode() != null){
-            resource.setMonitorMode(submission.getMonitorMode().toString());
-        }
-        resource.setResourceJobManagerResource(resourceJobManager);
-        if (submission.getSecurityProtocol() != null){
-            resource.setSecurityProtocol(submission.getSecurityProtocol().toString());
-        }
-        resource.setSshPort(submission.getSshPort());
-        return resource;
-    }
-    
-    
-    public static UnicoreJobSubmissionResource getUnicoreJobSubmission (UnicoreJobSubmission submission){
-    	UnicoreJobSubmissionResource resource = new UnicoreJobSubmissionResource();
-        resource.setjobSubmissionInterfaceId(submission.getJobSubmissionInterfaceId());
-        if (submission.getSecurityProtocol() != null){
-            resource.setSecurityProtocol(submission.getSecurityProtocol().toString());
-        }
-        resource.setUnicoreEndpointUrl(submission.getUnicoreEndPointURL());
-        return resource;
-    }
-
-    public static UnicoreDataMovementResource getUnicoreDMResource (UnicoreDataMovement dataMovement){
-        UnicoreDataMovementResource resource = new UnicoreDataMovementResource();
-        resource.setDataMovementId(dataMovement.getDataMovementInterfaceId());
-        if (dataMovement.getSecurityProtocol() != null){
-            resource.setSecurityProtocol(dataMovement.getSecurityProtocol().toString());
-        }
-        resource.setUnicoreEndpointUrl(dataMovement.getUnicoreEndPointURL());
-        return resource;
-    }
-
-    
-    public static CloudSubmissionResource getCloudJobSubmission (CloudJobSubmission submission){
-        CloudSubmissionResource resource = new CloudSubmissionResource();
-        resource.setJobSubmissionInterfaceId(submission.getJobSubmissionInterfaceId());
-        if (submission.getSecurityProtocol() != null){
-            resource.setSecurityProtocol(submission.getSecurityProtocol().toString());
-        }
-        if(submission.getProviderName() != null){
-            resource.setProviderName(submission.getProviderName().toString());
-        }
-        resource.setUserAccountName(submission.getUserAccountName());
-        resource.setNodeId(submission.getNodeId());
-        resource.setExecutableType(submission.getExecutableType());
-        return resource;
-    }
-
-    public static LocalDataMovementResource getLocalDataMovement(LOCALDataMovement localSubmission)throws AppCatalogException {
-    	LocalDataMovementResource submission = new LocalDataMovementResource();
-    	submission.setDataMovementInterfaceId(localSubmission.getDataMovementInterfaceId());
-    	return submission;
-    }
-    
-    public static LOCALDataMovement getLocalDataMovement(LocalDataMovementResource localSubmission)throws AppCatalogException {
-    	LOCALDataMovement submission = new LOCALDataMovement();
-    	submission.setDataMovementInterfaceId(localSubmission.getDataMovementInterfaceId());
-    	return submission;
-    }
-    
-    
-    public static LocalSubmissionResource getLocalJobSubmission(LOCALSubmission localSubmission)throws AppCatalogException {
-    	LocalSubmissionResource submission = new LocalSubmissionResource();
-    	submission.setJobSubmissionInterfaceId(localSubmission.getJobSubmissionInterfaceId());
-    	ResourceJobManagerResource resourceJobManager = getResourceJobManager(localSubmission.getResourceJobManager());
-    	submission.setResourceJobManagerId(resourceJobManager.getResourceJobManagerId());
-    	submission.setResourceJobManagerResource(resourceJobManager);
-    	return submission;
-    }
-    
-    public static LOCALSubmission getLocalJobSubmission(LocalSubmissionResource localSubmission)throws AppCatalogException {
-    	LOCALSubmission submission = new LOCALSubmission();
-    	submission.setJobSubmissionInterfaceId(localSubmission.getJobSubmissionInterfaceId());
-    	submission.setResourceJobManager(getResourceJobManager(localSubmission.getResourceJobManagerResource()));
-    	return submission;
-    }
-    
-    public static ResourceJobManagerResource getResourceJobManager(ResourceJobManager manager){
-    	ResourceJobManagerResource r = new ResourceJobManagerResource();
-    	r.setResourceJobManagerId(manager.getResourceJobManagerId());
-    	r.setJobManagerBinPath(manager.getJobManagerBinPath());
-    	r.setPushMonitoringEndpoint(manager.getPushMonitoringEndpoint());
-    	r.setResourceJobManagerType(manager.getResourceJobManagerType().toString());
-    	return r;
-    }
-    
-    public static ResourceJobManager getResourceJobManager(ResourceJobManagerResource manager) throws AppCatalogException {
-    	ResourceJobManager r = new ResourceJobManager();
-    	r.setResourceJobManagerId(manager.getResourceJobManagerId());
-    	r.setJobManagerBinPath(manager.getJobManagerBinPath());
-    	r.setPushMonitoringEndpoint(manager.getPushMonitoringEndpoint());
-    	r.setResourceJobManagerType(ResourceJobManagerType.valueOf(manager.getResourceJobManagerType()));
-    	r.setJobManagerCommands(new HashMap<JobManagerCommand, String>());
-    	JobManagerCommandResource jmcr=new JobManagerCommandResource();
-        List<Resource> jmcrList = jmcr.get(AbstractResource.JobManagerCommandConstants.RESOURCE_JOB_MANAGER_ID, manager.getResourceJobManagerId());
-        if (jmcrList != null && !jmcrList.isEmpty()){
-        	for (Resource rrr : jmcrList) {
-        		JobManagerCommandResource rr=(JobManagerCommandResource)rrr;
-        		r.getJobManagerCommands().put(JobManagerCommand.valueOf(rr.getCommandType()), rr.getCommand());
-			}
-        }
-    	return r;
-    }
-    
-    
-    public static SSHJobSubmission getSSHJobSubmissionDescription (SshJobSubmissionResource submission) throws AppCatalogException {
-    	SSHJobSubmission sshJobSubmission = new SSHJobSubmission();
-    	sshJobSubmission.setAlternativeSSHHostName(submission.getAlternativeSshHostname());
-    	sshJobSubmission.setJobSubmissionInterfaceId(submission.getJobSubmissionInterfaceId());
-    	sshJobSubmission.setResourceJobManager(getResourceJobManager(submission.getResourceJobManagerResource()));
-    	sshJobSubmission.setSecurityProtocol(SecurityProtocol.valueOf(submission.getSecurityProtocol()));
-    	sshJobSubmission.setSshPort(submission.getSshPort());
-        if (submission.getMonitorMode() != null){
-            sshJobSubmission.setMonitorMode(MonitorMode.valueOf(submission.getMonitorMode()));
-        }
-        return sshJobSubmission;
-    }
-
-    public static UnicoreJobSubmission getUnicoreJobSubmissionDescription (UnicoreJobSubmissionResource submission) throws AppCatalogException {
-    	UnicoreJobSubmission unicoreJobSubmission = new UnicoreJobSubmission();
-    	unicoreJobSubmission.setUnicoreEndPointURL(submission.getUnicoreEndpointUrl());
-    	unicoreJobSubmission.setJobSubmissionInterfaceId(submission.getjobSubmissionInterfaceId());
-        if (submission.getSecurityProtocol() != null){
-            unicoreJobSubmission.setSecurityProtocol(SecurityProtocol.valueOf(submission.getSecurityProtocol()));
-        }
-        return unicoreJobSubmission;
-    }
-
-    public static UnicoreDataMovement getUnicoreDMDescription (UnicoreDataMovementResource resource) throws AppCatalogException {
-        UnicoreDataMovement dataMovement = new UnicoreDataMovement();
-        dataMovement.setUnicoreEndPointURL(resource.getUnicoreEndpointUrl());
-        dataMovement.setDataMovementInterfaceId(resource.getDataMovementId());
-        if (resource.getSecurityProtocol() != null){
-            dataMovement.setSecurityProtocol(SecurityProtocol.valueOf(resource.getSecurityProtocol()));
-        }
-        return dataMovement;
-    }
-
-    
-    public static CloudJobSubmission getCloudJobSubmissionDescription (CloudSubmissionResource submission) throws AppCatalogException {
-        CloudJobSubmission cloudJobSubmission = new CloudJobSubmission();
-        cloudJobSubmission.setJobSubmissionInterfaceId(submission.getJobSubmissionInterfaceId());
-        cloudJobSubmission.setExecutableType(submission.getExecutableType());
-        cloudJobSubmission.setSecurityProtocol(SecurityProtocol.valueOf(submission.getSecurityProtocol()));
-        cloudJobSubmission.setNodeId(submission.getNodeId());
-        cloudJobSubmission.setUserAccountName(submission.getUserAccountName());
-        cloudJobSubmission.setProviderName(ProviderName.valueOf(submission.getProviderName()));
-        return cloudJobSubmission;
-    }
-
-//    public static GlobusJobSubmission getGlobusJobSubmissionDescription (GlobusJobSubmissionResource submission) throws AppCatalogException {
-//        GlobusJobSubmission globusJobSubmission = new GlobusJobSubmission();
-//        globusJobSubmission.setJobSubmissionInterfaceId(submission.getSubmissionID());
-//        globusJobSubmission.setResourceJobManager(ResourceJobManager.valueOf(submission.getResourceJobManager()));
-//        globusJobSubmission.setSecurityProtocol(SecurityProtocol.valueOf(submission.getSecurityProtocol()));
-//
-//        GlobusGKEndpointResource endpointResource = new GlobusGKEndpointResource();
-//        List<Resource> endpoints = endpointResource.get(AbstractResource.GlobusEPConstants.SUBMISSION_ID, submission.getSubmissionID());
-//        if (endpoints != null && !endpoints.isEmpty()){
-//            globusJobSubmission.setGlobusGateKeeperEndPoint(getGlobusGateKeeperEndPointList(endpoints));
-//        }
-//
-//        return globusJobSubmission;
-//    }
-
-    public static SCPDataMovement getSCPDataMovementDescription (ScpDataMovementResource dataMovementResource) throws AppCatalogException {
-        SCPDataMovement dataMovement = new SCPDataMovement();
-        dataMovement.setDataMovementInterfaceId(dataMovementResource.getDataMovementInterfaceId());
-        dataMovement.setAlternativeSCPHostName(dataMovementResource.getAlternativeScpHostname());
-        dataMovement.setSecurityProtocol(SecurityProtocol.valueOf(dataMovementResource.getSecurityProtocol()));
-        dataMovement.setSshPort(dataMovementResource.getSshPort());
-        return dataMovement;
-    }
-    
-    public static ScpDataMovementResource getSCPDataMovementDescription (SCPDataMovement dataMovementResource) throws AppCatalogException {
-    	ScpDataMovementResource dataMovement = new ScpDataMovementResource();
-        dataMovement.setDataMovementInterfaceId(dataMovementResource.getDataMovementInterfaceId());
-        dataMovement.setAlternativeScpHostname(dataMovementResource.getAlternativeSCPHostName());
-        dataMovement.setSecurityProtocol(dataMovementResource.getSecurityProtocol().toString());
-        dataMovement.setSshPort(dataMovementResource.getSshPort());
-        return dataMovement;
-    }
-
-    public static GridFTPDataMovement getGridFTPDataMovementDescription (GridftpDataMovementResource dataMovementResource) throws AppCatalogException {
-        GridFTPDataMovement dataMovement = new GridFTPDataMovement();
-        dataMovement.setDataMovementInterfaceId(dataMovementResource.getDataMovementInterfaceId());
-        dataMovement.setSecurityProtocol(SecurityProtocol.valueOf(dataMovementResource.getSecurityProtocol()));
-        GridftpEndpointResource endpointResource = new GridftpEndpointResource();
-        List<Resource> endpoints = endpointResource.get(AbstractResource.GridftpEndpointConstants.DATA_MOVEMENT_INTERFACE_ID, dataMovementResource.getDataMovementInterfaceId());
-        if (endpoints != null && !endpoints.isEmpty()){
-            dataMovement.setGridFTPEndPoints(getGridFTPDMEPList(endpoints));
-        }
-        return dataMovement;
-    }
-
-    public static GridftpDataMovementResource getGridFTPDataMovementDescription (GridFTPDataMovement dataMovementResource) throws AppCatalogException {
-    	GridftpDataMovementResource dataMovement = new GridftpDataMovementResource();
-        dataMovement.setDataMovementInterfaceId(dataMovementResource.getDataMovementInterfaceId());
-        dataMovement.setSecurityProtocol(dataMovementResource.getSecurityProtocol().toString());
-        return dataMovement;
-    }
-    
-    public static List<String> getGridFTPDMEPList (List<Resource> endpoints){
-        List<String> list = new ArrayList<String>();
-        for (Resource resource : endpoints){
-            list.add(((GridftpEndpointResource) resource).getEndpoint());
-        }
-        return list;
-    }
-
-    public static List<String> getGlobusGateKeeperEndPointList (List<Resource> resources) throws AppCatalogException {
-        List<String> list = new ArrayList<String>();
-        for (Resource resource : resources){
-            list.add(((GlobusGKEndpointResource) resource).getEndpoint());
-        }
-        return list;
-    }
-//
-//    public static List<GSISSHJobSubmission> getGSISSHSubmissionList (List<Resource> resources) throws AppCatalogException {
-//        List<GSISSHJobSubmission> list = new ArrayList<GSISSHJobSubmission>();
-//        for (Resource resource : resources){
-//            list.add(getGSISSHSubmissionDescription((GSISSHSubmissionResource) resource));
-//        }
-//        return list;
-//    }
-//
-//    public static List<GlobusJobSubmission> getGlobusSubmissionList (List<Resource> resources) throws AppCatalogException {
-//        List<GlobusJobSubmission> list = new ArrayList<GlobusJobSubmission>();
-//        for (Resource resource : resources){
-//            list.add(getGlobusJobSubmissionDescription((GlobusJobSubmissionResource) resource));
-//        }
-//        return list;
-//    }
-//
-//    public static List<SSHJobSubmission> getSSHSubmissionList (List<Resource> resources) throws AppCatalogException {
-//        List<SSHJobSubmission> list = new ArrayList<SSHJobSubmission>();
-//        for (Resource resource : resources){
-//            list.add(getSSHJobSubmissionDescription((SshJobSubmissionResource) resource));
-//        }
-//        return list;
-//    }
-//
-//    public static List<GridFTPDataMovement> getGridFTPDataMovementList (List<Resource> resources) throws AppCatalogException {
-//        List<GridFTPDataMovement> list = new ArrayList<GridFTPDataMovement>();
-//        for (Resource resource : resources){
-//            list.add(getGridFTPDataMovementDescription((GridftpDataMovementResource) resource));
-//        }
-//        return list;
-//    }
-//
-//    public static List<SCPDataMovement> getSCPDataMovementList (List<Resource> resources) throws AppCatalogException {
-//        List<SCPDataMovement> list = new ArrayList<SCPDataMovement>();
-//        for (Resource resource : resources){
-//            list.add(getSCPDataMovementDescription((ScpDataMovementResource) resource));
-//        }
-//        return list;
-//    }
-//
-//    public static Set<String> getGSISSHExports (List<Resource> gsisshExportResources){
-//        Set<String> exports = new HashSet<String>();
-//        for (Resource resource : gsisshExportResources){
-//            exports.add(((GSISSHExportResource) resource).getExport());
-//        }
-//        return exports;
-//    }
-//
-//    public static List<String> getGSISSHPreJobCommands (List<Resource> gsisshPreJobCommandResources){
-//        List<String> list = new ArrayList<String>();
-//        for (Resource resource : gsisshPreJobCommandResources){
-//            list.add(((GSISSHPreJobCommandResource) resource).getCommand());
-//        }
-//        return list;
-//    }
-//
-//    public static List<String> getGSISSHPostJobCommands (List<Resource> gsisshPostJobCommandResources){
-//        List<String> list = new ArrayList<String>();
-//        for (Resource resource : gsisshPostJobCommandResources){
-//            list.add(((GSISSHPostJobCommandResource) resource).getCommand());
-//        }
-//        return list;
-//    }
-//
-//    public static GlobusJobSubmissionResource getGlobusJobSubmission (GlobusJobSubmission submission){
-//        GlobusJobSubmissionResource resource = new GlobusJobSubmissionResource();
-//        resource.setSubmissionID(submission.getJobSubmissionDataID());
-//        resource.setSecurityProtocol(submission.getSecurityProtocol().toString());
-//        resource.setResourceJobManager(submission.getResourceJobManager().toString());
-//        return resource;
-//    }
-
-    public static ApplicationModule getApplicationModuleDesc (AppModuleResource resource){
-        ApplicationModule module = new ApplicationModule();
-        module.setAppModuleId(resource.getModuleId());
-        module.setAppModuleDescription(resource.getModuleDesc());
-        module.setAppModuleName(resource.getModuleName());
-        module.setAppModuleVersion(resource.getModuleVersion());
-        return module;
-    }
-
-    public static ApplicationInterfaceDescription getApplicationInterfaceDescription (AppInterfaceResource resource) throws AppCatalogException {
-        ApplicationInterfaceDescription description = new ApplicationInterfaceDescription();
-        description.setApplicationInterfaceId(resource.getInterfaceId());
-        description.setApplicationName(resource.getAppName());
-        description.setApplicationDescription(resource.getAppDescription());
-
-        AppModuleMappingResource appModuleMappingResource = new AppModuleMappingResource();
-        List<Resource> appModules = appModuleMappingResource.get(AbstractResource.AppModuleMappingConstants.INTERFACE_ID, resource.getInterfaceId());
-        if (appModules != null && !appModules.isEmpty()){
-            description.setApplicationModules(getAppModuleIds(appModules));
-        }
-
-        ApplicationInputResource inputResource = new ApplicationInputResource();
-        List<Resource> appInputs = inputResource.get(AbstractResource.AppInputConstants.INTERFACE_ID, resource.getInterfaceId());
-        if (appInputs != null && !appInputs.isEmpty()){
-            description.setApplicationInputs(getAppInputs(appInputs));
-        }
-
-        ApplicationOutputResource outputResource = new ApplicationOutputResource();
-        List<Resource> appOutputs = outputResource.get(AbstractResource.AppOutputConstants.INTERFACE_ID, resource.getInterfaceId());
-        if (appOutputs != null && !appOutputs.isEmpty()){
-            description.setApplicationOutputs(getAppOutputs(appOutputs));
-        }
-        return description;
-    }
-
-    public static List<String> getAppModuleIds (List<Resource> appModuleMappings){
-        List<String> modules = new ArrayList<String>();
-        for (Resource resource : appModuleMappings){
-            modules.add(((AppModuleMappingResource)resource).getModuleId());
-        }
-        return modules;
-    }
-
-    public static List<ApplicationModule> getAppModules (List<Resource> appModules){
-        List<ApplicationModule> modules = new ArrayList<ApplicationModule>();
-        for (Resource resource : appModules){
-            modules.add(getApplicationModuleDesc((AppModuleResource) resource));
-        }
-        return modules;
-    }
-
-    public static List<ApplicationInterfaceDescription> getAppInterfaceDescList (List<Resource> appInterfaces) throws AppCatalogException {
-        List<ApplicationInterfaceDescription> interfaceDescriptions = new ArrayList<ApplicationInterfaceDescription>();
-        for (Resource resource : appInterfaces){
-            interfaceDescriptions.add(getApplicationInterfaceDescription((AppInterfaceResource) resource));
-        }
-        return interfaceDescriptions;
-    }
-
-    public static List<InputDataObjectType> getAppInputs (List<Resource> resources){
-        List<InputDataObjectType> inputs = new ArrayList<InputDataObjectType>();
-        for (Resource resource : resources){
-            inputs.add(getInputDataObjType((ApplicationInputResource) resource));
-        }
-        return inputs;
-    }
-
-    public static InputDataObjectType getInputDataObjType (ApplicationInputResource input){
-        InputDataObjectType inputDataObjectType = new InputDataObjectType();
-        inputDataObjectType.setName(input.getInputKey());
-        inputDataObjectType.setValue(input.getInputVal());
-        inputDataObjectType.setApplicationArgument(input.getAppArgument());
-        inputDataObjectType.setInputOrder(input.getInputOrder());
-        inputDataObjectType.setMetaData(input.getMetadata());
-        inputDataObjectType.setType(DataType.valueOf(input.getDataType()));
-        inputDataObjectType.setStandardInput(input.isStandardInput());
-        inputDataObjectType.setUserFriendlyDescription(input.getUserFriendlyDesc());
-        inputDataObjectType.setIsRequired(input.getRequired());
-        inputDataObjectType.setRequiredToAddedToCommandLine(input.getRequiredToCMD());
-        inputDataObjectType.setDataStaged(input.isDataStaged());
-        return inputDataObjectType;
-    }
-
-    public static List<OutputDataObjectType> getAppOutputs (List<Resource> resources){
-        List<OutputDataObjectType> outputs = new ArrayList<OutputDataObjectType>();
-        for (Resource resource : resources){
-            outputs.add(getOutputDataObjType((ApplicationOutputResource) resource));
-        }
-        return outputs;
-    }
-    public static OutputDataObjectType getOutputDataObjType (ApplicationOutputResource output){
-        OutputDataObjectType outputDataObjectType = new OutputDataObjectType();
-        outputDataObjectType.setName(output.getOutputKey());
-        outputDataObjectType.setValue(output.getOutputVal());
-        outputDataObjectType.setType(DataType.valueOf(output.getDataType()));
-        outputDataObjectType.setIsRequired(output.getRequired());
-        outputDataObjectType.setRequiredToAddedToCommandLine(output.getRequiredToCMD());
-        outputDataObjectType.setDataMovement(output.isDataMovement());
-        outputDataObjectType.setLocation(output.getDataNameLocation());
-        outputDataObjectType.setSearchQuery(output.getSearchQuery());
-        outputDataObjectType.setApplicationArgument(output.getAppArgument());
-        return outputDataObjectType;
-    }
-
-    public static ApplicationDeploymentDescription getApplicationDeploymentDescription (AppDeploymentResource resource) throws AppCatalogException {
-        ApplicationDeploymentDescription description = new ApplicationDeploymentDescription();
-        description.setAppDeploymentId(resource.getDeploymentId());
-        description.setAppModuleId(resource.getAppModuleId());
-        description.setComputeHostId(resource.getHostId());
-        description.setExecutablePath(resource.getExecutablePath());
-        if (resource.getParallelism() != null){
-            description.setParallelism(ApplicationParallelismType.valueOf(resource.getParallelism()));
-        }
-        description.setAppDeploymentDescription(resource.getAppDes());
-        ModuleLoadCmdResource cmdResource = new ModuleLoadCmdResource();
-        List<Resource> moduleLoadCmds = cmdResource.get(AbstractResource.ModuleLoadCmdConstants.APP_DEPLOYMENT_ID, resource.getDeploymentId());
-        if (moduleLoadCmds != null && !moduleLoadCmds.isEmpty()){
-            for (Resource moduleLoadCmd : moduleLoadCmds){
-                description.addToModuleLoadCmds(((ModuleLoadCmdResource) moduleLoadCmd).getCmd());
-            }
-        }
-        LibraryPrepandPathResource prepandPathResource = new LibraryPrepandPathResource();
-        List<Resource> libPrepandPaths = prepandPathResource.get(AbstractResource.LibraryPrepandPathConstants.DEPLOYMENT_ID, resource.getDeploymentId());
-        if (libPrepandPaths != null && !libPrepandPaths.isEmpty()){
-            description.setLibPrependPaths(getLibPrepandPaths(libPrepandPaths));
-        }
-
-        LibraryApendPathResource apendPathResource = new LibraryApendPathResource();
-        List<Resource> libApendPaths = apendPathResource.get(AbstractResource.LibraryPrepandPathConstants.DEPLOYMENT_ID, resource.getDeploymentId());
-        if (libApendPaths != null && !libApendPaths.isEmpty()){
-            description.setLibAppendPaths(getLibApendPaths(libApendPaths));
-        }
-
-        AppEnvironmentResource appEnvironmentResource = new AppEnvironmentResource();
-        List<Resource> appEnvList = appEnvironmentResource.get(AbstractResource.LibraryPrepandPathConstants.DEPLOYMENT_ID, resource.getDeploymentId());
-        if (appEnvList != null && !appEnvList.isEmpty()){
-            description.setSetEnvironment(getAppEnvPaths(appEnvList));
-        }
-        PreJobCommandResource preJobCommandResource = new PreJobCommandResource();
-        List<Resource> preJobCommands = preJobCommandResource.get(AbstractResource.PreJobCommandConstants.DEPLOYMENT_ID, resource.getDeploymentId());
-        if (preJobCommands != null && !preJobCommands.isEmpty()){
-            for (Resource prejobCommand : preJobCommands){
-                description.addToPreJobCommands(((PreJobCommandResource) prejobCommand).getCommand());
-            }
-        }
-        PostJobCommandResource postJobCommandResource = new PostJobCommandResource();
-        List<Resource> postJobCommands = postJobCommandResource.get(AbstractResource.PostJobCommandConstants.DEPLOYMENT_ID, resource.getDeploymentId());
-        if (postJobCommands != null && !postJobCommands.isEmpty()){
-            for (Resource postjobCommand : postJobCommands){
-                description.addToPostJobCommands(((PostJobCommandResource) postjobCommand).getCommand());
-            }
-        }
-        return description;
-    }
-
-    public static List<ApplicationDeploymentDescription> getAppDepDescList (List<Resource> resources) throws AppCatalogException {
-        List<ApplicationDeploymentDescription> appList = new ArrayList<ApplicationDeploymentDescription>();
-        for (Resource resource : resources){
-            appList.add(getApplicationDeploymentDescription((AppDeploymentResource)resource));
-        }
-        return appList;
-    }
-
-    public static SetEnvPaths getSetEnvPath(Resource resource){
-        SetEnvPaths envPaths = new SetEnvPaths();
-        if (resource instanceof LibraryPrepandPathResource){
-            envPaths.setName(((LibraryPrepandPathResource) resource).getName());
-            envPaths.setValue(((LibraryPrepandPathResource) resource).getValue());
-            return envPaths;
-        }else if (resource instanceof LibraryApendPathResource){
-            envPaths.setName(((LibraryApendPathResource) resource).getName());
-            envPaths.setValue(((LibraryApendPathResource) resource).getValue());
-            return envPaths;
-        }else if (resource instanceof AppEnvironmentResource){
-            envPaths.setName(((AppEnvironmentResource) resource).getName());
-            envPaths.setValue(((AppEnvironmentResource) resource).getValue());
-            return envPaths;
-        }else {
-            return null;
-        }
-    }
-
-    public static List<SetEnvPaths> getLibPrepandPaths (List<Resource> prepandPaths){
-        List<SetEnvPaths> pathList = new ArrayList<SetEnvPaths>();
-        for (Resource resource : prepandPaths){
-            pathList.add(getSetEnvPath(resource));
-        }
-        return pathList;
-    }
-
-    public static List<SetEnvPaths> getLibApendPaths (List<Resource> appendPaths){
-        List<SetEnvPaths> pathList = new ArrayList<SetEnvPaths>();
-        for (Resource resource : appendPaths){
-            pathList.add(getSetEnvPath(resource));
-        }
-        return pathList;
-    }
-
-    public static List<SetEnvPaths> getAppEnvPaths (List<Resource> appEnvPaths){
-        List<SetEnvPaths> pathList = new ArrayList<SetEnvPaths>();
-        for (Resource resource : appEnvPaths){
-            pathList.add(getSetEnvPath(resource));
-        }
-        return pathList;
-    }
-
-    public static ComputeResourcePreference getComputeResourcePreference (ComputeHostPreferenceResource resource){
-        ComputeResourcePreference preference = new ComputeResourcePreference();
-        preference.setComputeResourceId(resource.getResourceId());
-        preference.setOverridebyAiravata(resource.getOverrideByAiravata());
-        if (resource.getPreferredJobProtocol() != null){
-            preference.setPreferredJobSubmissionProtocol(JobSubmissionProtocol.valueOf(resource.getPreferredJobProtocol()));
-        }
-        if (resource.getPreferedDMProtocol() != null){
-            preference.setPreferredDataMovementProtocol(DataMovementProtocol.valueOf(resource.getPreferedDMProtocol()));
-        }
-        preference.setPreferredBatchQueue(resource.getBatchQueue());
-        preference.setScratchLocation(resource.getScratchLocation());
-        preference.setAllocationProjectNumber(resource.getProjectNumber());
-        preference.setLoginUserName(resource.getLoginUserName());
-        return preference;
-    }
-
-    public static List<ComputeResourcePreference> getComputeResourcePreferences (List<Resource> resources){
-        List<ComputeResourcePreference> preferences = new ArrayList<ComputeResourcePreference>();
-        if (resources != null && !resources.isEmpty()){
-            for (Resource resource : resources){
-                 preferences.add(getComputeResourcePreference((ComputeHostPreferenceResource)resource));
-            }
-        }
-        return preferences;
-    }
-
-    public static InputDataObjectType getWorkflowInput (WorkflowInputResource resource){
-        InputDataObjectType input = new InputDataObjectType();
-        input.setName(resource.getInputKey());
-        input.setApplicationArgument(resource.getAppArgument());
-        input.setInputOrder(resource.getInputOrder());
-        input.setType(DataType.valueOf(resource.getDataType()));
-        input.setMetaData(resource.getMetadata());
-        input.setUserFriendlyDescription(resource.getUserFriendlyDesc());
-        input.setIsRequired(resource.getRequired());
-        input.setRequiredToAddedToCommandLine(resource.getRequiredToCMD());
-        input.setDataStaged(resource.isDataStaged());
-        return input;
-    }
-
-    public static List<InputDataObjectType> getWFInputs(List<Resource> resources){
-        List<InputDataObjectType> inputResources = new ArrayList<InputDataObjectType>();
-        if (resources != null && !resources.isEmpty()){
-            for (Resource resource : resources){
-                inputResources.add(getWorkflowInput((WorkflowInputResource) resource));
-            }
-        }
-        return inputResources;
-    }
-
-    public static GatewayResourceProfile getGatewayResourceProfile(GatewayProfileResource gw, List<ComputeResourcePreference> preferences){
-        GatewayResourceProfile gatewayProfile = new GatewayResourceProfile();
-        gatewayProfile.setGatewayID(gw.getGatewayID());
-        gatewayProfile.setComputeResourcePreferences(preferences);
-        return gatewayProfile;
-    }
-
-    public static Workflow getWorkflow (WorkflowResource resource) throws AppCatalogException {
-        Workflow workflow = new Workflow();
-        workflow.setTemplateId(resource.getWfTemplateId());
-        workflow.setGraph(resource.getGraph());
-        workflow.setName(resource.getWfName());
-        if (resource.getImage() != null){
-            workflow.setImage(resource.getImage().getBytes());
-        }
-        WorkflowInputResource inputResource = new WorkflowInputResource();
-        List<Resource> resources = inputResource.get(AbstractResource.WFInputConstants.WF_TEMPLATE_ID, resource.getWfTemplateId());
-        workflow.setWorkflowInputs(getWFInputs(resources));
-
-        return workflow;
-    }
-}

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/util/AppCatalogUtils.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogUtils.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogUtils.java
deleted file mode 100644
index 4b173be..0000000
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogUtils.java
+++ /dev/null
@@ -1,31 +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.util;
-
-import java.util.UUID;
-
-public class AppCatalogUtils {
-    public static String getID (String name){
-        String pro = name.replaceAll("\\s", "");
-        return pro + "_" + UUID.randomUUID();
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/ec8c6202/modules/app-catalog/app-catalog-data/src/main/resources/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/resources/META-INF/persistence.xml b/modules/app-catalog/app-catalog-data/src/main/resources/META-INF/persistence.xml
deleted file mode 100644
index 5fa184d..0000000
--- a/modules/app-catalog/app-catalog-data/src/main/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.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.
- *
-* -->
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0">
-    <persistence-unit name="appcatalog_data">
-        <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-        <class>org.apache.aiaravata.application.catalog.data.model.ComputeResource</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.GlobusJobSubmission</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.GlobusGKEndpoint</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.GSISSHSubmission</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.GSISSHExport</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.PreJobCommand</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.PostJobCommand</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.UnicoreJobSubmission</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.UnicoreDataMovement</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.HostAlias</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.HostIPAddress</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.ScpDataMovement</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.GridftpDataMovement</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.GridftpEndpoint</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.SshJobSubmission</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.ApplicationModule</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.ApplicationDeployment</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.ModuleLoadCmd</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.LibraryPrepandPath</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.LibraryApendPath</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.AppEnvironment</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.ApplicationInterface</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.AppModuleMapping</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.ApplicationInput</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.ApplicationOutput</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.GatewayProfile</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.ComputeResourcePreference</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.BatchQueue</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.ComputeResourceFileSystem</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.JobSubmissionInterface</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.DataMovementInterface</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.ResourceJobManager</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.JobManagerCommand</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.LocalSubmission</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.LocalDataMovement</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.Workflow</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.WorkflowInput</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.WorkflowOutput</class>
-        <class>org.apache.aiaravata.application.catalog.data.model.Configuration</class>
-        <exclude-unlisted-classes>true</exclude-unlisted-classes>
-    </persistence-unit>
-</persistence>

http://git-wip-us.apache.org/repos/asf/airavata/blob/ec8c6202/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql
deleted file mode 100644
index fc24d83..0000000
--- a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql
+++ /dev/null
@@ -1,460 +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.
- *
- */
-
-CREATE TABLE COMPUTE_RESOURCE
-(
-        RESOURCE_ID VARCHAR (255) NOT NULL,
-        HOST_NAME VARCHAR (255) NOT NULL,
-        RESOURCE_DESCRIPTION VARCHAR (255),
-        CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-        UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-        MAX_MEMORY_NODE INTEGER,
-        PRIMARY KEY (RESOURCE_ID)
-);
-
-CREATE TABLE HOST_ALIAS
-(
-         RESOURCE_ID VARCHAR(255),
-         ALIAS VARCHAR(255),
-         PRIMARY KEY(RESOURCE_ID,ALIAS),
-         FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE HOST_IPADDRESS
-(
-         RESOURCE_ID VARCHAR(255),
-         IP_ADDRESS VARCHAR(255),
-         PRIMARY KEY(RESOURCE_ID,IP_ADDRESS),
-         FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE GSISSH_SUBMISSION
-(
-         SUBMISSION_ID VARCHAR(255),
-         RESOURCE_JOB_MANAGER VARCHAR(255),
-         SSH_PORT INTEGER,
-         INSTALLED_PATH VARCHAR(255),
-         MONITOR_MODE VARCHAR(255),
-         PRIMARY KEY(SUBMISSION_ID)
-);
-
-CREATE TABLE GSISSH_EXPORT
-(
-         SUBMISSION_ID VARCHAR(255),
-         EXPORT VARCHAR(255),
-         PRIMARY KEY(SUBMISSION_ID, EXPORT),
-         FOREIGN KEY (SUBMISSION_ID) REFERENCES GSISSH_SUBMISSION(SUBMISSION_ID) ON DELETE CASCADE
-);
-
-
-
-CREATE TABLE GLOBUS_SUBMISSION
-(
-         SUBMISSION_ID VARCHAR(255),
-         RESOURCE_JOB_MANAGER VARCHAR(255),
-         SECURITY_PROTOCAL VARCHAR(255),
-         PRIMARY KEY(SUBMISSION_ID)
-);
-
-CREATE TABLE UNICORE_SUBMISSION
-(
-         SUBMISSION_ID VARCHAR(255),
-         SECURITY_PROTOCAL VARCHAR(255),
-         UNICORE_ENDPOINT_URL VARCHAR(255),
-         PRIMARY KEY(SUBMISSION_ID)
-);
-
-CREATE TABLE UNICORE_DATAMOVEMENT
-(
-         DATAMOVEMENT_ID VARCHAR(255),
-         SECURITY_PROTOCAL VARCHAR(255),
-         UNICORE_ENDPOINT_URL VARCHAR(255),
-         PRIMARY KEY(DATAMOVEMENT_ID)
-);
-
-
-CREATE TABLE GLOBUS_GK_ENDPOINT
-(
-         SUBMISSION_ID VARCHAR(255),
-         ENDPOINT VARCHAR(255),
-         PRIMARY KEY(SUBMISSION_ID, ENDPOINT),
-         FOREIGN KEY (SUBMISSION_ID) REFERENCES GLOBUS_SUBMISSION(SUBMISSION_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE RESOURCE_JOB_MANAGER
-(
-        RESOURCE_JOB_MANAGER_ID VARCHAR (255) NOT NULL,
-        PUSH_MONITORING_ENDPOINT VARCHAR (255),
-        JOB_MANAGER_BIN_PATH VARCHAR (255),
-        RESOURCE_JOB_MANAGER_TYPE VARCHAR (255) NOT NULL,
-        CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-        UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-        PRIMARY KEY (RESOURCE_JOB_MANAGER_ID)
-);
-
-
-
-CREATE TABLE SSH_JOB_SUBMISSION
-(
-        RESOURCE_JOB_MANAGER_ID VARCHAR (255) NOT NULL,
-        JOB_SUBMISSION_INTERFACE_ID VARCHAR (255) NOT NULL,
-        ALTERNATIVE_SSH_HOSTNAME VARCHAR (255),
-        SECURITY_PROTOCOL VARCHAR (255) NOT NULL,
-        SSH_PORT INTEGER,
-        MONITOR_MODE VARCHAR (255),
-        CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-        UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-        PRIMARY KEY (JOB_SUBMISSION_INTERFACE_ID),
-        FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID)
-);
-
-CREATE TABLE SCP_DATA_MOVEMENT
-(
-        QUEUE_DESCRIPTION VARCHAR (255),
-        DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
-        SECURITY_PROTOCOL VARCHAR (255) NOT NULL,
-        ALTERNATIVE_SCP_HOSTNAME VARCHAR (255),
-        SSH_PORT INTEGER,
-        CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-        UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-        PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID)
-);
-
-CREATE TABLE GRIDFTP_DATA_MOVEMENT
-(
-        DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
-        SECURITY_PROTOCOL VARCHAR (255) NOT NULL,
-        CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-        UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-        PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID)
-);
-
-CREATE TABLE GRIDFTP_ENDPOINT
-(
-        ENDPOINT VARCHAR (255) NOT NULL,
-        DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
-        PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID,ENDPOINT),
-        CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-        UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-        FOREIGN KEY (DATA_MOVEMENT_INTERFACE_ID) REFERENCES GRIDFTP_DATA_MOVEMENT(DATA_MOVEMENT_INTERFACE_ID) ON DELETE CASCADE
-);
-
---CREATE TABLE JOB_SUBMISSION_PROTOCOL
---(
---         RESOURCE_ID VARCHAR(255),
---         SUBMISSION_ID VARCHAR(255),
---         JOB_TYPE VARCHAR(255),
---         CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
---         UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
---         PRIMARY KEY(RESOURCE_ID,SUBMISSION_ID,JOB_TYPE),
---         FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
---);
---
---CREATE TABLE DATA_MOVEMENT_PROTOCOL
---(
---         RESOURCE_ID VARCHAR(255),
---         DATA_MOVE_ID VARCHAR(255),
---         DATA_MOVE_TYPE VARCHAR(255),
---         CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
---         UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
---         PRIMARY KEY(RESOURCE_ID,DATA_MOVE_ID,DATA_MOVE_TYPE),
---         FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
---);
-
-CREATE TABLE APPLICATION_MODULE
-(
-         MODULE_ID VARCHAR(255),
-         MODULE_NAME VARCHAR(255),
-         MODULE_VERSION VARCHAR(255),
-         MODULE_DESC VARCHAR(255),
-         GATEWAY_ID VARCHAR (255),
-         CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-         UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-         PRIMARY KEY(MODULE_ID)
-);
-
-CREATE TABLE APPLICATION_DEPLOYMENT
-(
-         DEPLOYMENT_ID VARCHAR(255),
-         APP_MODULE_ID VARCHAR(255),
-         COMPUTE_HOSTID VARCHAR(255),
-         EXECUTABLE_PATH VARCHAR(255),
-	       PARALLELISM VARCHAR(255),
-         APPLICATION_DESC VARCHAR(255),
-         CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-         UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-         GATEWAY_ID VARCHAR(255),
-         PRIMARY KEY(DEPLOYMENT_ID),
-         FOREIGN KEY (COMPUTE_HOSTID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE,
-         FOREIGN KEY (APP_MODULE_ID) REFERENCES APPLICATION_MODULE(MODULE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE MODULE_LOAD_CMD
-(
-        CMD VARCHAR (255) NOT NULL,
-        APP_DEPLOYMENT_ID VARCHAR (255) NOT NULL,
-        PRIMARY KEY (APP_DEPLOYMENT_ID,CMD),
-        FOREIGN KEY (APP_DEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE PREJOB_COMMAND
-(
-         APPDEPLOYMENT_ID VARCHAR(255),
-         COMMAND VARCHAR(255),
-         PRIMARY KEY(APPDEPLOYMENT_ID, COMMAND),
-         FOREIGN KEY (APPDEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE POSTJOB_COMMAND
-(
-         APPDEPLOYMENT_ID VARCHAR(255),
-         COMMAND VARCHAR(255),
-         PRIMARY KEY(APPDEPLOYMENT_ID, COMMAND),
-         FOREIGN KEY (APPDEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE LIBRARY_PREPAND_PATH
-(
-         DEPLOYMENT_ID VARCHAR(255),
-         NAME VARCHAR(255),
-         VALUE VARCHAR(255),
-         PRIMARY KEY(DEPLOYMENT_ID, NAME),
-         FOREIGN KEY (DEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE LIBRARY_APEND_PATH
-(
-         DEPLOYMENT_ID VARCHAR(255),
-         NAME VARCHAR(255),
-         VALUE VARCHAR(255),
-         PRIMARY KEY(DEPLOYMENT_ID, NAME),
-         FOREIGN KEY (DEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE APP_ENVIRONMENT
-(
-         DEPLOYMENT_ID VARCHAR(255),
-         NAME VARCHAR(255),
-         VALUE VARCHAR(255),
-         PRIMARY KEY(DEPLOYMENT_ID, NAME),
-         FOREIGN KEY (DEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE APPLICATION_INTERFACE
-(
-         INTERFACE_ID VARCHAR(255),
-         APPLICATION_NAME VARCHAR(255),
-         APPLICATION_DESCRIPTION VARCHAR(255),
-         GATEWAY_ID VARCHAR(255),
-         CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-         UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-         PRIMARY KEY(INTERFACE_ID)
-);
-
-CREATE TABLE APP_MODULE_MAPPING
-(
-         INTERFACE_ID VARCHAR(255),
-         MODULE_ID VARCHAR(255),
-         PRIMARY KEY(INTERFACE_ID, MODULE_ID),
-         FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE(INTERFACE_ID) ON DELETE CASCADE,
-         FOREIGN KEY (MODULE_ID) REFERENCES APPLICATION_MODULE(MODULE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE APPLICATION_INPUT
-(
-         INTERFACE_ID VARCHAR(255),
-         INPUT_KEY VARCHAR(255),
-         INPUT_VALUE VARCHAR(255),
-         DATA_TYPE VARCHAR(255),
-         METADATA VARCHAR(255),
-         APP_ARGUMENT VARCHAR(255),
-         STANDARD_INPUT SMALLINT,
-         INPUT_ORDER INTEGER,
-         IS_REQUIRED SMALLINT,
-         REQUIRED_TO_COMMANDLINE SMALLINT,
-         DATA_STAGED SMALLINT,
-         USER_FRIENDLY_DESC VARCHAR(255),
-         PRIMARY KEY(INTERFACE_ID,INPUT_KEY),
-         FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE(INTERFACE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE APPLICATION_OUTPUT
-(
-         INTERFACE_ID VARCHAR(255),
-         OUTPUT_KEY VARCHAR(255),
-         OUTPUT_VALUE VARCHAR(255),
-         DATA_TYPE VARCHAR(255),
-         IS_REQUIRED SMALLINT,
-         REQUIRED_TO_COMMANDLINE SMALLINT,
-         DATA_MOVEMENT SMALLINT,
-         DATA_NAME_LOCATION VARCHAR(255),
-         SEARCH_QUERY VARCHAR(255),
-         APP_ARGUMENT VARCHAR(255),
-         PRIMARY KEY(INTERFACE_ID,OUTPUT_KEY),
-         FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE(INTERFACE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE GATEWAY_PROFILE
-(
-         GATEWAY_ID VARCHAR(255),
-         CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-         UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-         PRIMARY KEY(GATEWAY_ID)
-);
-
-CREATE TABLE COMPUTE_RESOURCE_PREFERENCE
-(
-        GATEWAY_ID VARCHAR(255),
-        RESOURCE_ID VARCHAR(255),
-        OVERRIDE_BY_AIRAVATA SMALLINT,
-        PREFERED_JOB_SUB_PROTOCOL VARCHAR(255),
-        PREFERED_DATA_MOVE_PROTOCOL VARCHAR(255),
-        PREFERED_BATCH_QUEUE VARCHAR(255),
-        SCRATCH_LOCATION VARCHAR(255),
-        ALLOCATION_PROJECT_NUMBER VARCHAR(255),
-        LOGIN_USERNAME VARCHAR(255),
-        PRIMARY KEY(GATEWAY_ID,RESOURCE_ID),
-        FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE,
-        FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY_PROFILE(GATEWAY_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE BATCH_QUEUE
-(
-        COMPUTE_RESOURCE_ID VARCHAR(255) NOT NULL,
-        MAX_RUNTIME INTEGER,
-        MAX_JOB_IN_QUEUE INTEGER,
-        QUEUE_DESCRIPTION VARCHAR(255),
-        QUEUE_NAME VARCHAR(255) NOT NULL,
-        MAX_PROCESSORS INTEGER,
-        MAX_NODES INTEGER,
-        MAX_MEMORY INTEGER,
-        PRIMARY KEY (COMPUTE_RESOURCE_ID,QUEUE_NAME),
-        FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE COMPUTE_RESOURCE_FILE_SYSTEM
-(
-        COMPUTE_RESOURCE_ID VARCHAR (255) NOT NULL,
-        PATH VARCHAR (255),
-        FILE_SYSTEM VARCHAR (255) NOT NULL,
-        PRIMARY KEY (COMPUTE_RESOURCE_ID,FILE_SYSTEM),
-        FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
-  );
-
-CREATE TABLE JOB_SUBMISSION_INTERFACE
-(
-        JOB_SUBMISSION_INTERFACE_ID VARCHAR (255) NOT NULL,
-        COMPUTE_RESOURCE_ID VARCHAR (255) NOT NULL,
-        JOB_SUBMISSION_PROTOCOL VARCHAR (255) NOT NULL,
-        PRIORITY_ORDER INTEGER,
-        CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-        UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-        PRIMARY KEY (COMPUTE_RESOURCE_ID,JOB_SUBMISSION_INTERFACE_ID),
-        FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
-);
- 
-CREATE TABLE DATA_MOVEMENT_INTERFACE
-(
-        COMPUTE_RESOURCE_ID VARCHAR (255) NOT NULL,
-        DATA_MOVEMENT_PROTOCOL VARCHAR (255) NOT NULL,
-        DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
-        PRIORITY_ORDER INTEGER,
-        CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-        UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-        PRIMARY KEY (COMPUTE_RESOURCE_ID,DATA_MOVEMENT_INTERFACE_ID),
-        FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE JOB_MANAGER_COMMAND
-(
-        RESOURCE_JOB_MANAGER_ID VARCHAR (255) NOT NULL,
-        COMMAND_TYPE VARCHAR (255) NOT NULL,
-        COMMAND VARCHAR (255),
-        PRIMARY KEY (RESOURCE_JOB_MANAGER_ID,COMMAND_TYPE),
-        FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE LOCAL_SUBMISSION
-(
-        RESOURCE_JOB_MANAGER_ID VARCHAR (255) NOT NULL,
-        JOB_SUBMISSION_INTERFACE_ID VARCHAR (255) NOT NULL,
-        CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-        UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-        PRIMARY KEY (JOB_SUBMISSION_INTERFACE_ID),
-        FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID)
-      );
-
-CREATE TABLE LOCAL_DATA_MOVEMENT
-(
-	     DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
-	     PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID)
-);
-
-CREATE TABLE WORKFLOW
-(
-        WF_TEMPLATE_ID VARCHAR (255) NOT NULL,
-        WF_NAME VARCHAR (255) NOT NULL,
-        GRAPH CLOB,
-        OWNER VARCHAR(255),
-        GATEWAY_ID VARCHAR(255),
-        CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-        UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-        IMAGE BLOB,
-        PRIMARY KEY (WF_TEMPLATE_ID)
-);
-
-CREATE TABLE WORKFLOW_INPUT
-(
-         WF_TEMPLATE_ID VARCHAR(255),
-         INPUT_KEY VARCHAR(255),
-         INPUT_VALUE CLOB,
-         DATA_TYPE VARCHAR(255),
-         METADATA VARCHAR(255),
-         APP_ARGUMENT VARCHAR(255),
-         STANDARD_INPUT SMALLINT,
-         USER_FRIENDLY_DESC VARCHAR(255),
-         PRIMARY KEY(WF_TEMPLATE_ID,INPUT_KEY),
-         FOREIGN KEY (WF_TEMPLATE_ID) REFERENCES WORKFLOW(WF_TEMPLATE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE WORKFLOW_OUTPUT
-(
-         WF_TEMPLATE_ID VARCHAR(255),
-         OUTPUT_KEY VARCHAR(255),
-         OUTPUT_VALUE CLOB,
-         DATA_TYPE VARCHAR(255),
-         PRIMARY KEY(WF_TEMPLATE_ID,OUTPUT_KEY),
-         FOREIGN KEY (WF_TEMPLATE_ID) REFERENCES WORKFLOW(WF_TEMPLATE_ID) ON DELETE CASCADE
-);
-
-
-
-CREATE TABLE CONFIGURATION
-(
-        CONFIG_KEY VARCHAR(255),
-        CONFIG_VAL VARCHAR(255),
-        PRIMARY KEY(CONFIG_KEY, CONFIG_VAL)
-);
-
-INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL) VALUES('app_catalog_version', '0.15');
-
-
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/ec8c6202/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql
deleted file mode 100644
index 234a26a..0000000
--- a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql
+++ /dev/null
@@ -1,453 +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.
- *
- */
-CREATE TABLE COMPUTE_RESOURCE
-(
-          RESOURCE_ID VARCHAR (255) NOT NULL,
-          HOST_NAME VARCHAR (255) NOT NULL,
-          RESOURCE_DESCRIPTION VARCHAR (255),
-          CREATION_TIME TIMESTAMP DEFAULT NOW(),
-          UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-          MAX_MEMORY_NODE INTEGER,
-          PRIMARY KEY (RESOURCE_ID)
-);
-
-CREATE TABLE HOST_ALIAS
-(
-         RESOURCE_ID VARCHAR(255),
-         ALIAS VARCHAR(255),
-         PRIMARY KEY(RESOURCE_ID,ALIAS),
-         FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE HOST_IPADDRESS
-(
-         RESOURCE_ID VARCHAR(255),
-         IP_ADDRESS VARCHAR(255),
-         PRIMARY KEY(RESOURCE_ID,IP_ADDRESS),
-         FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE GSISSH_SUBMISSION
-(
-         SUBMISSION_ID VARCHAR(255),
-         RESOURCE_JOB_MANAGER VARCHAR(255),
-         SSH_PORT INTEGER,
-         INSTALLED_PATH VARCHAR(255),
-         MONITOR_MODE VARCHAR(255),
-         PRIMARY KEY(SUBMISSION_ID)
-);
-
-CREATE TABLE GSISSH_EXPORT
-(
-         SUBMISSION_ID VARCHAR(255),
-         EXPORT VARCHAR(255),
-         PRIMARY KEY(SUBMISSION_ID, EXPORT),
-         FOREIGN KEY (SUBMISSION_ID) REFERENCES GSISSH_SUBMISSION(SUBMISSION_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE GSISSH_PREJOBCOMMAND
-(
-         SUBMISSION_ID VARCHAR(255),
-         COMMAND VARCHAR(255),
-         PRIMARY KEY(SUBMISSION_ID, COMMAND),
-         FOREIGN KEY (SUBMISSION_ID) REFERENCES GSISSH_SUBMISSION(SUBMISSION_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE GSISSH_POSTJOBCOMMAND
-(
-         SUBMISSION_ID VARCHAR(255),
-         COMMAND VARCHAR(255),
-         PRIMARY KEY(SUBMISSION_ID, COMMAND),
-         FOREIGN KEY (SUBMISSION_ID) REFERENCES GSISSH_SUBMISSION(SUBMISSION_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE GLOBUS_SUBMISSION
-(
-         SUBMISSION_ID VARCHAR(255),
-         RESOURCE_JOB_MANAGER VARCHAR(255),
-         SECURITY_PROTOCAL VARCHAR(255),
-         PRIMARY KEY(SUBMISSION_ID)
-);
-CREATE TABLE UNICORE_SUBMISSION
-(
-         SUBMISSION_ID VARCHAR(255),
-         SECURITY_PROTOCAL VARCHAR(255),
-         UNICORE_ENDPOINT_URL VARCHAR(255),
-         PRIMARY KEY(SUBMISSION_ID)
-);
-
-CREATE TABLE UNICORE_DATAMOVEMENT
-(
-         DATAMOVEMENT_ID VARCHAR(255),
-         SECURITY_PROTOCAL VARCHAR(255),
-         UNICORE_ENDPOINT_URL VARCHAR(255),
-         PRIMARY KEY(DATAMOVEMENT_ID)
-);
-
-CREATE TABLE GLOBUS_GK_ENDPOINT
-(
-         SUBMISSION_ID VARCHAR(255),
-         ENDPOINT VARCHAR(255),
-         PRIMARY KEY(SUBMISSION_ID, ENDPOINT),
-         FOREIGN KEY (SUBMISSION_ID) REFERENCES GLOBUS_SUBMISSION(SUBMISSION_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE RESOURCE_JOB_MANAGER
-(
-        RESOURCE_JOB_MANAGER_ID VARCHAR (255) NOT NULL,
-        PUSH_MONITORING_ENDPOINT VARCHAR (255),
-        JOB_MANAGER_BIN_PATH VARCHAR (255),
-        RESOURCE_JOB_MANAGER_TYPE VARCHAR (255) NOT NULL,
-        CREATION_TIME TIMESTAMP DEFAULT NOW(),
-        UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-        PRIMARY KEY (RESOURCE_JOB_MANAGER_ID)
-);
-
-CREATE TABLE SSH_JOB_SUBMISSION
-(
-        RESOURCE_JOB_MANAGER_ID VARCHAR (255) NOT NULL,
-        JOB_SUBMISSION_INTERFACE_ID VARCHAR (255) NOT NULL,
-        ALTERNATIVE_SSH_HOSTNAME VARCHAR (255),
-        SECURITY_PROTOCOL VARCHAR (255) NOT NULL,
-        SSH_PORT INTEGER,
-        MONITOR_MODE VARCHAR (255),
-        CREATION_TIME TIMESTAMP DEFAULT NOW(),
-        UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ,
-        PRIMARY KEY (JOB_SUBMISSION_INTERFACE_ID),
-        FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID)
-);
-
-
-CREATE TABLE SCP_DATA_MOVEMENT
-(
-        QUEUE_DESCRIPTION VARCHAR (255),
-        DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
-        SECURITY_PROTOCOL VARCHAR (255) NOT NULL,
-        ALTERNATIVE_SCP_HOSTNAME VARCHAR (255),
-        SSH_PORT INTEGER,
-        CREATION_TIME TIMESTAMP DEFAULT NOW(),
-        UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ,
-        PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID)
-);
-
-CREATE TABLE GRIDFTP_DATA_MOVEMENT
-(
-        DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
-        SECURITY_PROTOCOL VARCHAR (255) NOT NULL,
-        CREATION_TIME TIMESTAMP DEFAULT NOW(),
-        UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ,
-        PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID)
-);
-
-CREATE TABLE GRIDFTP_ENDPOINT
-(
-        ENDPOINT VARCHAR (255) NOT NULL,
-        DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
-        PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID,ENDPOINT),
-        CREATION_TIME TIMESTAMP DEFAULT NOW(),
-        UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ,
-        FOREIGN KEY (DATA_MOVEMENT_INTERFACE_ID) REFERENCES GRIDFTP_DATA_MOVEMENT(DATA_MOVEMENT_INTERFACE_ID) ON DELETE CASCADE
-);
-
---CREATE TABLE JOB_SUBMISSION_PROTOCOL
---(
---         RESOURCE_ID VARCHAR(255),
---         SUBMISSION_ID VARCHAR(255),
---         JOB_TYPE VARCHAR(255),
---         PRIMARY KEY(RESOURCE_ID,SUBMISSION_ID,JOB_TYPE),
---         FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
---);
---
---CREATE TABLE DATA_MOVEMENT_PROTOCOL
---(
---         RESOURCE_ID VARCHAR(255),
---         DATA_MOVE_ID VARCHAR(255),
---         DATA_MOVE_TYPE VARCHAR(255),
---         PRIMARY KEY(RESOURCE_ID,DATA_MOVE_ID,DATA_MOVE_TYPE),
---         FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
---);
-
-CREATE TABLE APPLICATION_MODULE
-(
-         MODULE_ID VARCHAR(255),
-         MODULE_NAME VARCHAR(255),
-         MODULE_VERSION VARCHAR(255),
-         MODULE_DESC VARCHAR(255),
-         GATEWAY_ID VARCHAR (255),
-	       CREATION_TIME TIMESTAMP DEFAULT NOW(),
-         UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ,
-         PRIMARY KEY(MODULE_ID)
-);
-
-CREATE TABLE APPLICATION_DEPLOYMENT
-(
-         DEPLOYMENT_ID VARCHAR(255),
-         APP_MODULE_ID VARCHAR(255),
-         COMPUTE_HOSTID VARCHAR(255),
-         EXECUTABLE_PATH VARCHAR(255),
-	       PARALLELISM VARCHAR(255),
-         APPLICATION_DESC VARCHAR(255),
-         ENV_MODULE_LOAD_CMD VARCHAR(255),
-	       CREATION_TIME TIMESTAMP DEFAULT NOW(),
-         UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ,
-         GATEWAY_ID VARCHAR(255),
-         PRIMARY KEY(DEPLOYMENT_ID),
-         FOREIGN KEY (COMPUTE_HOSTID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE,
-         FOREIGN KEY (APP_MODULE_ID) REFERENCES APPLICATION_MODULE(MODULE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE LIBRARY_PREPAND_PATH
-(
-         DEPLOYMENT_ID VARCHAR(255),
-         NAME VARCHAR(255),
-         VALUE VARCHAR(255),
-         PRIMARY KEY(DEPLOYMENT_ID, NAME),
-         FOREIGN KEY (DEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE LIBRARY_APEND_PATH
-(
-         DEPLOYMENT_ID VARCHAR(255),
-         NAME VARCHAR(255),
-         VALUE VARCHAR(255),
-         PRIMARY KEY(DEPLOYMENT_ID, NAME),
-         FOREIGN KEY (DEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE APP_ENVIRONMENT
-(
-         DEPLOYMENT_ID VARCHAR(255),
-         NAME VARCHAR(255),
-         VALUE VARCHAR(255),
-         PRIMARY KEY(DEPLOYMENT_ID, NAME),
-         FOREIGN KEY (DEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE PREJOB_COMMAND
-(
-         APPDEPLOYMENT_ID VARCHAR(255),
-         COMMAND VARCHAR(255),
-         PRIMARY KEY(APPDEPLOYMENT_ID, COMMAND),
-         FOREIGN KEY (APPDEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE POSTJOB_COMMAND
-(
-         APPLICATION_DEPLOYMENT VARCHAR(255),
-         COMMAND VARCHAR(255),
-         PRIMARY KEY(APPLICATION_DEPLOYMENT, COMMAND),
-         FOREIGN KEY (APPLICATION_DEPLOYMENT) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE APPLICATION_INTERFACE
-(
-         INTERFACE_ID VARCHAR(255),
-         APPLICATION_NAME VARCHAR(255),
-         APPLICATION_DESCRIPTION VARCHAR(255),
-	     CREATION_TIME TIMESTAMP DEFAULT NOW(),
-         UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ,
-         PRIMARY KEY(INTERFACE_ID)
-);
-
-CREATE TABLE APP_MODULE_MAPPING
-(
-         INTERFACE_ID VARCHAR(255),
-         MODULE_ID VARCHAR(255),
-         PRIMARY KEY(INTERFACE_ID, MODULE_ID),
-         FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE(INTERFACE_ID) ON DELETE CASCADE,
-         FOREIGN KEY (MODULE_ID) REFERENCES APPLICATION_MODULE(MODULE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE APPLICATION_INPUT
-(
-         INTERFACE_ID VARCHAR(255),
-         INPUT_KEY VARCHAR(255),
-         INPUT_VALUE VARCHAR(255),
-         DATA_TYPE VARCHAR(255),
-         METADATA VARCHAR(255),
-         APP_ARGUMENT VARCHAR(255),
-         STANDARD_INPUT SMALLINT,
-         USER_FRIENDLY_DESC VARCHAR(255),
-         INPUT_ORDER INTEGER,
-         IS_REQUIRED SMALLINT,
-         REQUIRED_TO_COMMANDLINE SMALLINT,
-         DATA_STAGED SMALLINT,
-         PRIMARY KEY(INTERFACE_ID,INPUT_KEY),
-         FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE(INTERFACE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE APPLICATION_OUTPUT
-(
-         INTERFACE_ID VARCHAR(255),
-         OUTPUT_KEY VARCHAR(255),
-         OUTPUT_VALUE VARCHAR(255),
-         DATA_TYPE VARCHAR(255),
-         IS_REQUIRED SMALLINT,
-         REQUIRED_TO_COMMANDLINE SMALLINT,
-         DATA_MOVEMENT SMALLINT,
-         DATA_NAME_LOCATION VARCHAR(255),
-         SEARCH_QUERY VARCHAR(255),
-         APP_ARGUMENT VARCHAR(255),
-         PRIMARY KEY(INTERFACE_ID,OUTPUT_KEY),
-         FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE(INTERFACE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE GATEWAY_PROFILE
-(
-         GATEWAY_ID VARCHAR(255),
-	       CREATION_TIME TIMESTAMP DEFAULT NOW(),
-         UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ,
-         PRIMARY KEY(GATEWAY_ID)
-);
-
-CREATE TABLE COMPUTE_RESOURCE_PREFERENCE
-(
-        GATEWAY_ID VARCHAR(255),
-        RESOURCE_ID VARCHAR(255),
-        OVERRIDE_BY_AIRAVATA SMALLINT,
-        PREFERED_JOB_SUB_PROTOCOL VARCHAR(255),
-        PREFERED_DATA_MOVE_PROTOCOL VARCHAR(255),
-        PREFERED_BATCH_QUEUE VARCHAR(255),
-        SCRATCH_LOCATION VARCHAR(255),
-        ALLOCATION_PROJECT_NUMBER VARCHAR(255),
-        LOGIN_USERNAME VARCHAR(255),
-        PRIMARY KEY(GATEWAY_ID,RESOURCE_ID),
-        FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE,
-        FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY_PROFILE(GATEWAY_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE BATCH_QUEUE
-(
-        COMPUTE_RESOURCE_ID VARCHAR(255) NOT NULL,
-        MAX_RUNTIME INTEGER,
-        MAX_JOB_IN_QUEUE INTEGER,
-        QUEUE_DESCRIPTION VARCHAR(255),
-        QUEUE_NAME VARCHAR(255) NOT NULL,
-        MAX_PROCESSORS INTEGER,
-        MAX_NODES INTEGER,
-        MAX_MEMORY INTEGER,
-        PRIMARY KEY (COMPUTE_RESOURCE_ID,QUEUE_NAME),
-        FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE COMPUTE_RESOURCE_FILE_SYSTEM
-(
-        COMPUTE_RESOURCE_ID VARCHAR (255) NOT NULL,
-        PATH VARCHAR (255),
-        FILE_SYSTEM VARCHAR (255) NOT NULL,
-        PRIMARY KEY (COMPUTE_RESOURCE_ID,FILE_SYSTEM),
-        FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE JOB_SUBMISSION_INTERFACE
-(
-        JOB_SUBMISSION_INTERFACE_ID VARCHAR (255) NOT NULL,
-        COMPUTE_RESOURCE_ID VARCHAR (255) NOT NULL,
-        JOB_SUBMISSION_PROTOCOL VARCHAR (255) NOT NULL,
-        PRIORITY_ORDER INTEGER,
-        CREATION_TIME TIMESTAMP DEFAULT NOW(),
-        UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-        PRIMARY KEY (COMPUTE_RESOURCE_ID,JOB_SUBMISSION_INTERFACE_ID),
-        FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
-);
- 
-CREATE TABLE DATA_MOVEMENT_INTERFACE
-(
-        COMPUTE_RESOURCE_ID VARCHAR (255) NOT NULL,
-        DATA_MOVEMENT_PROTOCOL VARCHAR (255) NOT NULL,
-        DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
-        PRIORITY_ORDER INTEGER,
-        CREATION_TIME TIMESTAMP DEFAULT NOW(),
-        UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-        PRIMARY KEY (COMPUTE_RESOURCE_ID,DATA_MOVEMENT_INTERFACE_ID),
-        FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE JOB_MANAGER_COMMAND
-(
-        RESOURCE_JOB_MANAGER_ID VARCHAR (255) NOT NULL,
-        COMMAND_TYPE VARCHAR (255) NOT NULL,
-        COMMAND VARCHAR (255),
-        PRIMARY KEY (RESOURCE_JOB_MANAGER_ID,COMMAND_TYPE),
-        FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE LOCAL_SUBMISSION
-(
-        RESOURCE_JOB_MANAGER_ID VARCHAR (255) NOT NULL,
-        JOB_SUBMISSION_INTERFACE_ID VARCHAR (255) NOT NULL,
-        CREATION_TIME TIMESTAMP DEFAULT NOW(),
-        UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-        PRIMARY KEY (JOB_SUBMISSION_INTERFACE_ID),
-        FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID)
-);
-
-CREATE TABLE LOCAL_DATA_MOVEMENT
-(
-        DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
-        PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID)
-);
-
-CREATE TABLE WORKFLOW
-(
-        WF_TEMPLATE_ID VARCHAR (255) NOT NULL,
-        WF_NAME VARCHAR (255) NOT NULL,
-        GRAPH LONGTEXT,
-        OWNER VARCHAR(255),
-        CREATION_TIME TIMESTAMP DEFAULT NOW(),
-        UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-        IMAGE BLOB,
-        PRIMARY KEY (WF_TEMPLATE_ID)
-);
-
-CREATE TABLE WORKFLOW_INPUT
-(
-         WF_TEMPLATE_ID VARCHAR(255),
-         INPUT_KEY VARCHAR(255),
-         INPUT_VALUE LONGTEXT,
-         DATA_TYPE VARCHAR(255),
-         METADATA VARCHAR(255),
-         APP_ARGUMENT VARCHAR(255),
-         STANDARD_INPUT SMALLINT,
-         USER_FRIENDLY_DESC VARCHAR(255),
-         PRIMARY KEY(WF_TEMPLATE_ID,INPUT_KEY),
-         FOREIGN KEY (WF_TEMPLATE_ID) REFERENCES WORKFLOW(WF_TEMPLATE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE WORKFLOW_OUTPUT
-(
-         WF_TEMPLATE_ID VARCHAR(255),
-         OUTPUT_KEY VARCHAR(255),
-         OUTPUT_VALUE LONGTEXT,
-         DATA_TYPE VARCHAR(255),
-         PRIMARY KEY(WF_TEMPLATE_ID,OUTPUT_KEY),
-         FOREIGN KEY (WF_TEMPLATE_ID) REFERENCES WORKFLOW(WF_TEMPLATE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE CONFIGURATION
-(
-          CONFIG_KEY VARCHAR(255),
-          CONFIG_VAL VARCHAR(255),
-          PRIMARY KEY(CONFIG_KEY, CONFIG_VAL)
-);
-
-INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL) VALUES('app_catalog_version', '0.15');
-


Mime
View raw message