airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject [2/3] git commit: AIRAVATA-1236
Date Sat, 05 Jul 2014 01:28:48 GMT
AIRAVATA-1236


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

Branch: refs/heads/master
Commit: c42adb46c1914ac07dde618cfba29487ddcc6221
Parents: 2e04f68
Author: Saminda Wijeratne <samindaw@gmail.com>
Authored: Fri Jul 4 21:28:16 2014 -0400
Committer: Saminda Wijeratne <samindaw@gmail.com>
Committed: Fri Jul 4 21:28:16 2014 -0400

----------------------------------------------------------------------
 .../client/tools/DocumentCreatorNew.java        | 1402 +++++++++---------
 .../catalog/data/model/JobManagerCommand.java   |   89 ++
 .../data/model/JobManagerCommand_PK.java        |   59 +
 .../catalog/data/model/ResourceJobManager.java  |   83 ++
 .../data/resources/AbstractResource.java        |   17 +
 .../resources/JobManagerCommandResource.java    |  297 ++++
 .../resources/ResourceJobManagerResource.java   |  269 ++++
 .../catalog/data/util/AppCatalogJPAUtils.java   |   36 +
 .../data/util/AppCatalogResourceType.java       |    4 +-
 .../src/main/resources/META-INF/persistence.xml |    2 +
 .../src/main/resources/appcatalog-derby.sql     |   17 +
 .../appcatalog/JobManagerCommandGenerator.java  |   84 ++
 .../appcatalog/ResourceJobManagerGenerator.java |   83 ++
 .../main/java/generators/JPAClassGenerator.java |    3 +
 .../generators/JPAResourceClassGenerator.java   |    2 +-
 15 files changed, 1742 insertions(+), 705 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/c42adb46/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java
----------------------------------------------------------------------
diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java b/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java
index 2cf971b..39e56fe 100644
--- a/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java
+++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java
@@ -43,10 +43,6 @@ import org.apache.airavata.model.appcatalog.appdeployment.SetEnvPaths;
 import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription;
 import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType;
 import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType;
-import org.apache.airavata.model.computehost.ComputeResourceDescription;
-import org.apache.airavata.model.computehost.JobSubmissionProtocol;
-import org.apache.airavata.model.computehost.ResourceJobManager;
-import org.apache.airavata.model.computehost.SSHJobSubmission;
 import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
 import org.apache.airavata.schemas.gfac.DataType;
 import org.apache.airavata.schemas.gfac.GlobusHostType;
@@ -61,173 +57,261 @@ import org.apache.airavata.schemas.gfac.QueueType;
 
 public class DocumentCreatorNew {
 
-    private AppCatalog appcatalog = null;
-    private String trestleshpcHostAddress = "trestles.sdsc.edu";
-    private String lonestarHostAddress = "lonestar.tacc.utexas.edu";
-    private String stampedeHostAddress  = "stampede.tacc.xsede.org";
-    private String gridftpAddress = "gsiftp://trestles-dm1.sdsc.edu:2811";
-    private String gramAddress = "trestles-login1.sdsc.edu:2119/jobmanager-pbstest2";
-
-
-    public DocumentCreatorNew(AppCatalog appcatalog) {
-        this.appcatalog = appcatalog;
-    }
-
-    public void createLocalHostDocs() {
-        HostDescription descriptor = new HostDescription();
-        descriptor.getType().setHostName("localhost");
-        descriptor.getType().setHostAddress("127.0.0.1");
-        try {
-            airavataAPI.getApplicationManager().saveHostDescription(descriptor);
-        } catch (AiravataAPIInvocationException e) {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        }
-
-        String serviceName = "SimpleEcho0";
-        ServiceDescription serviceDescription = new ServiceDescription();
-        List<InputParameterType> inputParameters = new ArrayList<InputParameterType>();
-        List<OutputParameterType> outputParameters = new ArrayList<OutputParameterType>();
-        serviceDescription.getType().setName(serviceName);
-        serviceDescription.getType().setDescription("Echo service");
-        // Creating input parameters
-        InputParameterType parameter = InputParameterType.Factory.newInstance();
-        parameter.setParameterName("echo_input");
-        parameter.setParameterDescription("echo input");
-        ParameterType parameterType = parameter.addNewParameterType();
-        parameterType.setType(DataType.STRING);
-        parameterType.setName("String");
-        inputParameters.add(parameter);
-
-        // Creating output parameters
-        OutputParameterType outputParameter = OutputParameterType.Factory.newInstance();
-        outputParameter.setParameterName("echo_output");
-        outputParameter.setParameterDescription("Echo output");
-        ParameterType outputParaType = outputParameter.addNewParameterType();
-        outputParaType.setType(DataType.STRING);
-        outputParaType.setName("String");
-        outputParameters.add(outputParameter);
-
-        // Setting input and output parameters to serviceDescriptor
-        serviceDescription.getType().setInputParametersArray(inputParameters.toArray(new InputParameterType[]{}));
-        serviceDescription.getType().setOutputParametersArray(outputParameters.toArray(new OutputParameterType[]{}));
-
-        try {
-            airavataAPI.getApplicationManager().saveServiceDescription(serviceDescription);
-        } catch (AiravataAPIInvocationException e) {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        }
-
-        ApplicationDescription applicationDeploymentDescription = new ApplicationDescription();
-        ApplicationDeploymentDescriptionType applicationDeploymentDescriptionType = applicationDeploymentDescription
-                .getType();
-        applicationDeploymentDescriptionType.addNewApplicationName().setStringValue("EchoApplication");
-        applicationDeploymentDescriptionType.setExecutableLocation("/bin/echo");
-        applicationDeploymentDescriptionType.setScratchWorkingDirectory("/tmp");
-
-        try {
-            airavataAPI.getApplicationManager().saveApplicationDescription(serviceName, "localhost", applicationDeploymentDescription);
-        } catch (AiravataAPIInvocationException e) {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        }
-    }
-    
-
-    public InputDataObjectType createAppInput (String inputName, String value, org.apache.airavata.model.appcatalog.appinterface.DataType type ){
-        InputDataObjectType input = new InputDataObjectType();
-        input.setName(inputName);
-        input.setValue(value);
-        input.setType(type);
-        input.setApplicationArgument("test arg");
-        return input;
-    }
-
-    public OutputDataObjectType createAppOutput (String inputName, String value, org.apache.airavata.model.appcatalog.appinterface.DataType type ){
-        OutputDataObjectType outputDataObjectType = new OutputDataObjectType();
-        outputDataObjectType.setName(inputName);
-        outputDataObjectType.setValue(value);
-        outputDataObjectType.setType(type);
-        return outputDataObjectType;
-    }
-    
-    public String createSSHHostDocs() throws AppCatalogException {
-    	ComputeResource computeResource = appcatalog.getComputeResource();
-        ApplicationInterface appInt = appcatalog.getApplicationInterface();
-        ApplicationDeployment appDep = appcatalog.getApplicationDeployment();
-        
-        ComputeResourceDescription description = new ComputeResourceDescription();
-        description.setHostName("gw111.iu.xsede.org");
-        description.setResourceDescription("gw111 ssh access");
-        Set<String> ipdaresses = new HashSet<String>();
-        ipdaresses.add("gw111.iu.xsede.org");
-        description.setIpAddresses(ipdaresses);
-        description.setHostAliases(new HashSet<String>());
-        SSHJobSubmission jobSubmission = new SSHJobSubmission();
-        jobSubmission.setSshPort(22);
-        jobSubmission.setResourceJobManager(ResourceJobManager.PBS);
-        String sshsubmissionId = appcatalog.getComputeResource().addSSHJobSubmission(jobSubmission);
-        description.setPreferredJobSubmissionProtocol(sshsubmissionId);
-        Map<String, JobSubmissionProtocol> jobProtools = new HashMap<String, JobSubmissionProtocol>();
-        jobProtools.put(sshsubmissionId, JobSubmissionProtocol.SSH);
-        description.setJobSubmissionProtocols(jobProtools);
-        String resourceId = computeResource.addComputeResource(description);
-    	
-
-        ApplicationModule module = new ApplicationModule();
-        module.setAppModuleName("echo");
-        module.setAppModuleVersion("1.0.0");
-        String echoModuleId = appInt.addApplicationModule(module);
-
-        
-        ApplicationDeploymentDescription deployment = new ApplicationDeploymentDescription();
-        deployment.setAppModuleId(echoModuleId);
-        deployment.setComputeHostId(resourceId);
-        deployment.setExecutablePath("/bin/echo");
-        deployment.setAppDeploymentDescription("SSHEchoApplication");
-        appDep.addApplicationDeployment(deployment);
-        
-        
-        ApplicationInterfaceDescription application = new ApplicationInterfaceDescription();
-        List<String> modules = new ArrayList<String>();
-        modules.add(echoModuleId);
-        application.setApplicationModules(modules);
-        List<InputDataObjectType> inputs = new ArrayList<InputDataObjectType>();
-        List<OutputDataObjectType> outputs = new ArrayList<OutputDataObjectType>();
-        InputDataObjectType appInput1 = createAppInput("echo_input", null, org.apache.airavata.model.appcatalog.appinterface.DataType.STRING);
-        OutputDataObjectType output1 = createAppOutput("echo_output", null, org.apache.airavata.model.appcatalog.appinterface.DataType.STRING);
-        inputs.add(appInput1);
-        outputs.add(output1);
-        application.setApplicationName("SSHEcho1");
-        application.setApplicationInputs(inputs);
-        application.setApplicationOutputs(outputs);
-        return appInt.addApplicationInterface(application);
-    }
-
-    public void createGramDocs() {
-//        /*
-//           creating host descriptor for gram
-//        */
-//        HostDescription host = new HostDescription(GlobusHostType.type);
+//    private AppCatalog appcatalog = null;
+//    private String trestleshpcHostAddress = "trestles.sdsc.edu";
+//    private String lonestarHostAddress = "lonestar.tacc.utexas.edu";
+//    private String stampedeHostAddress  = "stampede.tacc.xsede.org";
+//    private String gridftpAddress = "gsiftp://trestles-dm1.sdsc.edu:2811";
+//    private String gramAddress = "trestles-login1.sdsc.edu:2119/jobmanager-pbstest2";
+//
+//
+//    public DocumentCreatorNew(AppCatalog appcatalog) {
+//        this.appcatalog = appcatalog;
+//    }
+//
+//    public void createLocalHostDocs() {
+//        HostDescription descriptor = new HostDescription();
+//        descriptor.getType().setHostName("localhost");
+//        descriptor.getType().setHostAddress("127.0.0.1");
+//        try {
+//            airavataAPI.getApplicationManager().saveHostDescription(descriptor);
+//        } catch (AiravataAPIInvocationException e) {
+//            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+//        }
+//
+//        String serviceName = "SimpleEcho0";
+//        ServiceDescription serviceDescription = new ServiceDescription();
+//        List<InputParameterType> inputParameters = new ArrayList<InputParameterType>();
+//        List<OutputParameterType> outputParameters = new ArrayList<OutputParameterType>();
+//        serviceDescription.getType().setName(serviceName);
+//        serviceDescription.getType().setDescription("Echo service");
+//        // Creating input parameters
+//        InputParameterType parameter = InputParameterType.Factory.newInstance();
+//        parameter.setParameterName("echo_input");
+//        parameter.setParameterDescription("echo input");
+//        ParameterType parameterType = parameter.addNewParameterType();
+//        parameterType.setType(DataType.STRING);
+//        parameterType.setName("String");
+//        inputParameters.add(parameter);
+//
+//        // Creating output parameters
+//        OutputParameterType outputParameter = OutputParameterType.Factory.newInstance();
+//        outputParameter.setParameterName("echo_output");
+//        outputParameter.setParameterDescription("Echo output");
+//        ParameterType outputParaType = outputParameter.addNewParameterType();
+//        outputParaType.setType(DataType.STRING);
+//        outputParaType.setName("String");
+//        outputParameters.add(outputParameter);
+//
+//        // Setting input and output parameters to serviceDescriptor
+//        serviceDescription.getType().setInputParametersArray(inputParameters.toArray(new InputParameterType[]{}));
+//        serviceDescription.getType().setOutputParametersArray(outputParameters.toArray(new OutputParameterType[]{}));
+//
+//        try {
+//            airavataAPI.getApplicationManager().saveServiceDescription(serviceDescription);
+//        } catch (AiravataAPIInvocationException e) {
+//            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+//        }
+//
+//        ApplicationDescription applicationDeploymentDescription = new ApplicationDescription();
+//        ApplicationDeploymentDescriptionType applicationDeploymentDescriptionType = applicationDeploymentDescription
+//                .getType();
+//        applicationDeploymentDescriptionType.addNewApplicationName().setStringValue("EchoApplication");
+//        applicationDeploymentDescriptionType.setExecutableLocation("/bin/echo");
+//        applicationDeploymentDescriptionType.setScratchWorkingDirectory("/tmp");
+//
+//        try {
+//            airavataAPI.getApplicationManager().saveApplicationDescription(serviceName, "localhost", applicationDeploymentDescription);
+//        } catch (AiravataAPIInvocationException e) {
+//            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+//        }
+//    }
+//    
+//
+//    public InputDataObjectType createAppInput (String inputName, String value, org.apache.airavata.model.appcatalog.appinterface.DataType type ){
+//        InputDataObjectType input = new InputDataObjectType();
+//        input.setName(inputName);
+//        input.setValue(value);
+//        input.setType(type);
+//        input.setApplicationArgument("test arg");
+//        return input;
+//    }
+//
+//    public OutputDataObjectType createAppOutput (String inputName, String value, org.apache.airavata.model.appcatalog.appinterface.DataType type ){
+//        OutputDataObjectType outputDataObjectType = new OutputDataObjectType();
+//        outputDataObjectType.setName(inputName);
+//        outputDataObjectType.setValue(value);
+//        outputDataObjectType.setType(type);
+//        return outputDataObjectType;
+//    }
+//    
+//    public String createSSHHostDocs() throws AppCatalogException {
+//    	ComputeResource computeResource = appcatalog.getComputeResource();
+//        ApplicationInterface appInt = appcatalog.getApplicationInterface();
+//        ApplicationDeployment appDep = appcatalog.getApplicationDeployment();
+//        
+//        ComputeResourceDescription description = new ComputeResourceDescription();
+//        description.setHostName("gw111.iu.xsede.org");
+//        description.setResourceDescription("gw111 ssh access");
+//        Set<String> ipdaresses = new HashSet<String>();
+//        ipdaresses.add("gw111.iu.xsede.org");
+//        description.setIpAddresses(ipdaresses);
+//        description.setHostAliases(new HashSet<String>());
+//        SSHJobSubmission jobSubmission = new SSHJobSubmission();
+//        jobSubmission.setSshPort(22);
+//        jobSubmission.setResourceJobManager(ResourceJobManager.PBS);
+//        String sshsubmissionId = appcatalog.getComputeResource().addSSHJobSubmission(jobSubmission);
+//        description.setPreferredJobSubmissionProtocol(sshsubmissionId);
+//        Map<String, JobSubmissionProtocol> jobProtools = new HashMap<String, JobSubmissionProtocol>();
+//        jobProtools.put(sshsubmissionId, JobSubmissionProtocol.SSH);
+//        description.setJobSubmissionProtocols(jobProtools);
+//        String resourceId = computeResource.addComputeResource(description);
+//    	
+//
+//        ApplicationModule module = new ApplicationModule();
+//        module.setAppModuleName("echo");
+//        module.setAppModuleVersion("1.0.0");
+//        String echoModuleId = appInt.addApplicationModule(module);
+//
+//        
+//        ApplicationDeploymentDescription deployment = new ApplicationDeploymentDescription();
+//        deployment.setAppModuleId(echoModuleId);
+//        deployment.setComputeHostId(resourceId);
+//        deployment.setExecutablePath("/bin/echo");
+//        deployment.setAppDeploymentDescription("SSHEchoApplication");
+//        appDep.addApplicationDeployment(deployment);
+//        
+//        
+//        ApplicationInterfaceDescription application = new ApplicationInterfaceDescription();
+//        List<String> modules = new ArrayList<String>();
+//        modules.add(echoModuleId);
+//        application.setApplicationModules(modules);
+//        List<InputDataObjectType> inputs = new ArrayList<InputDataObjectType>();
+//        List<OutputDataObjectType> outputs = new ArrayList<OutputDataObjectType>();
+//        InputDataObjectType appInput1 = createAppInput("echo_input", null, org.apache.airavata.model.appcatalog.appinterface.DataType.STRING);
+//        OutputDataObjectType output1 = createAppOutput("echo_output", null, org.apache.airavata.model.appcatalog.appinterface.DataType.STRING);
+//        inputs.add(appInput1);
+//        outputs.add(output1);
+//        application.setApplicationName("SSHEcho1");
+//        application.setApplicationInputs(inputs);
+//        application.setApplicationOutputs(outputs);
+//        return appInt.addApplicationInterface(application);
+//    }
+//
+//    public void createGramDocs() {
+////        /*
+////           creating host descriptor for gram
+////        */
+////        HostDescription host = new HostDescription(GlobusHostType.type);
+////        host.getType().setHostAddress(trestleshpcHostAddress);
+////        host.getType().setHostName(trestleshpcHostAddress);
+////        ((GlobusHostType) host.getType()).setGlobusGateKeeperEndPointArray(new String[]{gramAddress});
+////        ((GlobusHostType) host.getType()).setGridFTPEndPointArray(new String[]{gridftpAddress});
+////        try {
+////            airavataAPI.getApplicationManager().saveHostDescription(host);
+////        } catch (AiravataAPIInvocationException e) {
+////            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+////        }
+////
+////
+////        /*
+////        * Service Description creation and saving
+////        */
+////        String serviceName = "SimpleEcho1";
+////        ServiceDescription serv = new ServiceDescription();
+////        serv.getType().setName(serviceName);
+////
+////        List<InputParameterType> inputList = new ArrayList<InputParameterType>();
+////        List<OutputParameterType> outputList = new ArrayList<OutputParameterType>();
+////
+////        InputParameterType input = InputParameterType.Factory.newInstance();
+////        input.setParameterName("echo_input");
+////        ParameterType parameterType = input.addNewParameterType();
+////        parameterType.setType(DataType.STRING);
+////        parameterType.setName("String");
+////
+////        OutputParameterType output = OutputParameterType.Factory.newInstance();
+////        output.setParameterName("echo_output");
+////        ParameterType parameterType1 = output.addNewParameterType();
+////        parameterType1.setType(DataType.STRING);
+////        parameterType1.setName("String");
+////
+////        inputList.add(input);
+////        outputList.add(output);
+////
+////        InputParameterType[] inputParamList = inputList.toArray(new InputParameterType[inputList.size()]);
+////        OutputParameterType[] outputParamList = outputList.toArray(new OutputParameterType[outputList.size()]);
+////
+////        serv.getType().setInputParametersArray(inputParamList);
+////        serv.getType().setOutputParametersArray(outputParamList);
+////        try {
+////            airavataAPI.getApplicationManager().saveServiceDescription(serv);
+////        } catch (AiravataAPIInvocationException e) {
+////            e.printStackTrace();
+////        }
+////
+////        /*
+////            Application descriptor creation and saving
+////         */
+////        ApplicationDescription appDesc = new ApplicationDescription(HpcApplicationDeploymentType.type);
+////        HpcApplicationDeploymentType app = (HpcApplicationDeploymentType) appDesc.getType();
+////        ApplicationDeploymentDescriptionType.ApplicationName name = ApplicationDeploymentDescriptionType.ApplicationName.Factory.newInstance();
+////        name.setStringValue("EchoLocal");
+////        app.setApplicationName(name);
+////        ProjectAccountType projectAccountType = app.addNewProjectAccount();
+////        projectAccountType.setProjectAccountNumber("sds128");
+////
+////        QueueType queueType = app.addNewQueue();
+////        queueType.setQueueName("normal");
+////
+////        app.setCpuCount(1);
+////        app.setJobType(JobTypeType.SERIAL);
+////        app.setNodeCount(1);
+////        app.setProcessorsPerNode(1);
+////
+////        /*
+////           * Use bat file if it is compiled on Windows
+////           */
+////        app.setExecutableLocation("/bin/echo");
+////
+////        /*
+////           * Default tmp location
+////           */
+////        String tempDir = "/home/ogce/scratch";
+////        app.setScratchWorkingDirectory(tempDir);
+////        app.setMaxMemory(10);
+////
+////
+////        try {
+////            airavataAPI.getApplicationManager().saveApplicationDescription(serviceName, trestleshpcHostAddress, appDesc);
+////        } catch (AiravataAPIInvocationException e) {
+////            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+////        }
+//    }
+//
+//    public void createPBSDocsForOGCE() {
+//        HostDescription host = new HostDescription(GsisshHostType.type);
 //        host.getType().setHostAddress(trestleshpcHostAddress);
 //        host.getType().setHostName(trestleshpcHostAddress);
-//        ((GlobusHostType) host.getType()).setGlobusGateKeeperEndPointArray(new String[]{gramAddress});
-//        ((GlobusHostType) host.getType()).setGridFTPEndPointArray(new String[]{gridftpAddress});
+//        ((GsisshHostType) host.getType()).setPort(22);
+//        ((GsisshHostType) host.getType()).setInstalledPath("/opt/torque/bin/");
+//
 //        try {
 //            airavataAPI.getApplicationManager().saveHostDescription(host);
 //        } catch (AiravataAPIInvocationException e) {
 //            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
 //        }
-//
-//
 //        /*
 //        * Service Description creation and saving
 //        */
-//        String serviceName = "SimpleEcho1";
+//        String serviceName = "SimpleEcho2";
 //        ServiceDescription serv = new ServiceDescription();
 //        serv.getType().setName(serviceName);
 //
 //        List<InputParameterType> inputList = new ArrayList<InputParameterType>();
 //        List<OutputParameterType> outputList = new ArrayList<OutputParameterType>();
 //
+//
 //        InputParameterType input = InputParameterType.Factory.newInstance();
 //        input.setParameterName("echo_input");
 //        ParameterType parameterType = input.addNewParameterType();
@@ -251,7 +335,7 @@ public class DocumentCreatorNew {
 //        try {
 //            airavataAPI.getApplicationManager().saveServiceDescription(serv);
 //        } catch (AiravataAPIInvocationException e) {
-//            e.printStackTrace();
+//            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
 //        }
 //
 //        /*
@@ -272,7 +356,7 @@ public class DocumentCreatorNew {
 //        app.setJobType(JobTypeType.SERIAL);
 //        app.setNodeCount(1);
 //        app.setProcessorsPerNode(1);
-//
+//        app.setMaxWallTime(10);
 //        /*
 //           * Use bat file if it is compiled on Windows
 //           */
@@ -281,558 +365,470 @@ public class DocumentCreatorNew {
 //        /*
 //           * Default tmp location
 //           */
-//        String tempDir = "/home/ogce/scratch";
-//        app.setScratchWorkingDirectory(tempDir);
-//        app.setMaxMemory(10);
+//        String tempDir = "/oasis/scratch/trestles/ogce/temp_project/";
 //
+//     
+//        app.setScratchWorkingDirectory(tempDir);
+//        app.setInstalledParentPath("/opt/torque/bin/");
 //
 //        try {
 //            airavataAPI.getApplicationManager().saveApplicationDescription(serviceName, trestleshpcHostAddress, appDesc);
 //        } catch (AiravataAPIInvocationException e) {
 //            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
 //        }
-    }
-
-    public void createPBSDocsForOGCE() {
-        HostDescription host = new HostDescription(GsisshHostType.type);
-        host.getType().setHostAddress(trestleshpcHostAddress);
-        host.getType().setHostName(trestleshpcHostAddress);
-        ((GsisshHostType) host.getType()).setPort(22);
-        ((GsisshHostType) host.getType()).setInstalledPath("/opt/torque/bin/");
-
-        try {
-            airavataAPI.getApplicationManager().saveHostDescription(host);
-        } catch (AiravataAPIInvocationException e) {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        }
-        /*
-        * Service Description creation and saving
-        */
-        String serviceName = "SimpleEcho2";
-        ServiceDescription serv = new ServiceDescription();
-        serv.getType().setName(serviceName);
-
-        List<InputParameterType> inputList = new ArrayList<InputParameterType>();
-        List<OutputParameterType> outputList = new ArrayList<OutputParameterType>();
-
-
-        InputParameterType input = InputParameterType.Factory.newInstance();
-        input.setParameterName("echo_input");
-        ParameterType parameterType = input.addNewParameterType();
-        parameterType.setType(DataType.STRING);
-        parameterType.setName("String");
-
-        OutputParameterType output = OutputParameterType.Factory.newInstance();
-        output.setParameterName("echo_output");
-        ParameterType parameterType1 = output.addNewParameterType();
-        parameterType1.setType(DataType.STRING);
-        parameterType1.setName("String");
-
-        inputList.add(input);
-        outputList.add(output);
-
-        InputParameterType[] inputParamList = inputList.toArray(new InputParameterType[inputList.size()]);
-        OutputParameterType[] outputParamList = outputList.toArray(new OutputParameterType[outputList.size()]);
-
-        serv.getType().setInputParametersArray(inputParamList);
-        serv.getType().setOutputParametersArray(outputParamList);
-        try {
-            airavataAPI.getApplicationManager().saveServiceDescription(serv);
-        } catch (AiravataAPIInvocationException e) {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        }
-
-        /*
-            Application descriptor creation and saving
-         */
-        ApplicationDescription appDesc = new ApplicationDescription(HpcApplicationDeploymentType.type);
-        HpcApplicationDeploymentType app = (HpcApplicationDeploymentType) appDesc.getType();
-        ApplicationDeploymentDescriptionType.ApplicationName name = ApplicationDeploymentDescriptionType.ApplicationName.Factory.newInstance();
-        name.setStringValue("EchoLocal");
-        app.setApplicationName(name);
-        ProjectAccountType projectAccountType = app.addNewProjectAccount();
-        projectAccountType.setProjectAccountNumber("sds128");
-
-        QueueType queueType = app.addNewQueue();
-        queueType.setQueueName("normal");
-
-        app.setCpuCount(1);
-        app.setJobType(JobTypeType.SERIAL);
-        app.setNodeCount(1);
-        app.setProcessorsPerNode(1);
-        app.setMaxWallTime(10);
-        /*
-           * Use bat file if it is compiled on Windows
-           */
-        app.setExecutableLocation("/bin/echo");
-
-        /*
-           * Default tmp location
-           */
-        String tempDir = "/oasis/scratch/trestles/ogce/temp_project/";
-
-     
-        app.setScratchWorkingDirectory(tempDir);
-        app.setInstalledParentPath("/opt/torque/bin/");
-
-        try {
-            airavataAPI.getApplicationManager().saveApplicationDescription(serviceName, trestleshpcHostAddress, appDesc);
-        } catch (AiravataAPIInvocationException e) {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        }
-
-         /*
-        * Service Description creation and saving
-        */
-        String wrfserviceName = "WRF";
-        ServiceDescription wrfServ = new ServiceDescription();
-        wrfServ.getType().setName(wrfserviceName);
-
-        List<InputParameterType> wrfinputList = new ArrayList<InputParameterType>();
-        List<OutputParameterType> wrfoutputList = new ArrayList<OutputParameterType>();
-
-
-        InputParameterType wrfinput1 = InputParameterType.Factory.newInstance();
-        wrfinput1.setParameterName("WRF_Namelist");
-        ParameterType wrfparameterType1 = wrfinput1.addNewParameterType();
-        wrfparameterType1.setType(DataType.URI);
-        wrfparameterType1.setName("URI");
-
-        InputParameterType wrfinput2 = InputParameterType.Factory.newInstance();
-        wrfinput2.setParameterName("WRF_Input_File");
-        ParameterType wrfparameterType2 = wrfinput2.addNewParameterType();
-        wrfparameterType2.setType(DataType.URI);
-        wrfparameterType2.setName("URI");
-
-        InputParameterType wrfinput3 = InputParameterType.Factory.newInstance();
-        wrfinput3.setParameterName("WRF_Boundary_File");
-        ParameterType wrfparameterType3 = wrfinput3.addNewParameterType();
-        wrfparameterType3.setType(DataType.URI);
-        wrfparameterType3.setName("URI");
-
-        OutputParameterType wrfOutput1 = OutputParameterType.Factory.newInstance();
-        wrfOutput1.setParameterName("WRF_Output");
-        ParameterType wrfoutparameterType1 = wrfOutput1.addNewParameterType();
-        wrfoutparameterType1.setType(DataType.URI);
-        wrfoutparameterType1.setName("URI");
-
-        OutputParameterType wrfOutput2 = OutputParameterType.Factory.newInstance();
-        wrfOutput2.setParameterName("WRF_Execution_Log");
-        ParameterType wrfoutparameterType2 = wrfOutput2.addNewParameterType();
-        wrfoutparameterType2.setType(DataType.URI);
-        wrfoutparameterType2.setName("URI");
-
-        wrfinputList.add(wrfinput1);
-        wrfinputList.add(wrfinput2);
-        wrfinputList.add(wrfinput3);
-        wrfoutputList.add(wrfOutput1);
-        wrfoutputList.add(wrfOutput2);
-
-        InputParameterType[] wrfinputParamList = wrfinputList.toArray(new InputParameterType[wrfinputList.size()]);
-        OutputParameterType[] wrfoutputParamList = wrfoutputList.toArray(new OutputParameterType[wrfoutputList.size()]);
-
-        wrfServ.getType().setInputParametersArray(wrfinputParamList);
-        wrfServ.getType().setOutputParametersArray(wrfoutputParamList);
-        try {
-            airavataAPI.getApplicationManager().saveServiceDescription(wrfServ);
-        } catch (AiravataAPIInvocationException e) {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        }
-
-        /*
-            Application descriptor creation and saving
-         */
-        ApplicationDescription wrfAppDesc = new ApplicationDescription(HpcApplicationDeploymentType.type);
-        HpcApplicationDeploymentType wrfApp = (HpcApplicationDeploymentType) wrfAppDesc.getType();
-        ApplicationDeploymentDescriptionType.ApplicationName wrfName = ApplicationDeploymentDescriptionType.ApplicationName.Factory.newInstance();
-        wrfName.setStringValue("WRF");
-        wrfApp.setApplicationName(wrfName);
-        ProjectAccountType wrfprojectAccountType = wrfApp.addNewProjectAccount();
-        wrfprojectAccountType.setProjectAccountNumber("sds128");
-
-        QueueType wrfQueueType = wrfApp.addNewQueue();
-        wrfQueueType.setQueueName("normal");
-
-        wrfApp.setCpuCount(32);
-        wrfApp.setJobType(JobTypeType.MPI);
-        wrfApp.setNodeCount(2);
-        wrfApp.setProcessorsPerNode(1);
-        wrfApp.setMaxWallTime(30);
-        /*
-           * Use bat file if it is compiled on Windows
-           */
-        wrfApp.setExecutableLocation("/home/ogce/apps/wrf_wrapper.sh");
-
-        /*
-           * Default tmp location
-           */
-        String wrfTempDir = "/oasis/scratch/trestles/ogce/temp_project/";
-
-        wrfApp.setScratchWorkingDirectory(wrfTempDir);
-        wrfApp.setInstalledParentPath("/opt/torque/bin/");
-
-        try {
-            airavataAPI.getApplicationManager().saveApplicationDescription(wrfserviceName, trestleshpcHostAddress, wrfAppDesc);
-        } catch (AiravataAPIInvocationException e) {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        }
-    }
-
-   
-    public void createSlurmDocs() {
-        HostDescription host = new HostDescription(GsisshHostType.type);
-        host.getType().setHostAddress(stampedeHostAddress);
-        host.getType().setHostName(stampedeHostAddress);
-        ((GsisshHostType) host.getType()).setJobManager("slurm");
-        ((GsisshHostType) host.getType()).setInstalledPath("/usr/bin/");
-        ((GsisshHostType) host.getType()).setPort(2222);
-        ((GsisshHostType) host.getType()).setMonitorMode("push");
-    
-
-        try {
-            airavataAPI.getApplicationManager().saveHostDescription(host);
-        } catch (AiravataAPIInvocationException e) {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        }
-        /*
-        * Service Description creation and saving
-        */
-        String serviceName = "SimpleEcho3";
-        ServiceDescription serv = new ServiceDescription();
-        serv.getType().setName(serviceName);
-
-        List<InputParameterType> inputList = new ArrayList<InputParameterType>();
-        List<OutputParameterType> outputList = new ArrayList<OutputParameterType>();
-
-
-        InputParameterType input = InputParameterType.Factory.newInstance();
-        input.setParameterName("echo_input");
-        ParameterType parameterType = input.addNewParameterType();
-        parameterType.setType(DataType.STRING);
-        parameterType.setName("String");
-
-        OutputParameterType output = OutputParameterType.Factory.newInstance();
-        output.setParameterName("echo_output");
-        ParameterType parameterType1 = output.addNewParameterType();
-        parameterType1.setType(DataType.STRING);
-        parameterType1.setName("String");
-
-        inputList.add(input);
-        outputList.add(output);
-
-        InputParameterType[] inputParamList = inputList.toArray(new InputParameterType[inputList.size()]);
-        OutputParameterType[] outputParamList = outputList.toArray(new OutputParameterType[outputList.size()]);
-
-        serv.getType().setInputParametersArray(inputParamList);
-        serv.getType().setOutputParametersArray(outputParamList);
-        try {
-            airavataAPI.getApplicationManager().saveServiceDescription(serv);
-        } catch (AiravataAPIInvocationException e) {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        }
-
-        /*
-           Application descriptor creation and saving
-        */
-        ApplicationDescription appDesc = new ApplicationDescription(HpcApplicationDeploymentType.type);
-        HpcApplicationDeploymentType app = (HpcApplicationDeploymentType) appDesc.getType();
-        ApplicationDeploymentDescriptionType.ApplicationName name = ApplicationDeploymentDescriptionType.ApplicationName.Factory.newInstance();
-        name.setStringValue("EchoLocal");
-        app.setApplicationName(name);
-        ProjectAccountType projectAccountType = app.addNewProjectAccount();
-        projectAccountType.setProjectAccountNumber("TG-STA110014S");
-
-        QueueType queueType = app.addNewQueue();
-        queueType.setQueueName("normal");
-
-        app.setCpuCount(1);
-        app.setJobType(JobTypeType.SERIAL);
-        app.setNodeCount(1);
-        app.setProcessorsPerNode(1);
-        app.setMaxWallTime(10);
-        /*
-        * Use bat file if it is compiled on Windows
-        */
-        app.setExecutableLocation("/bin/echo");
-
-        /*
-        * Default tmp location
-        */
-        String tempDir = "/home1/01437/ogce";
-
-
-        app.setScratchWorkingDirectory(tempDir);
-        app.setInstalledParentPath("/usr/bin/");
-
-        try {
-            airavataAPI.getApplicationManager().saveApplicationDescription(serviceName, stampedeHostAddress, appDesc);
-        } catch (AiravataAPIInvocationException e) {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        }
-    }
-
-    public void createSGEDocs() {
-        HostDescription host = new HostDescription(GsisshHostType.type);
-        host.getType().setHostAddress(lonestarHostAddress);
-        host.getType().setHostName(lonestarHostAddress);
-        ((GsisshHostType) host.getType()).setJobManager("sge");
-        ((GsisshHostType) host.getType()).setInstalledPath("/opt/sge6.2/bin/lx24-amd64/");
-        ((GsisshHostType) host.getType()).setPort(22);
-        try {
-            airavataAPI.getApplicationManager().saveHostDescription(host);
-        } catch (AiravataAPIInvocationException e) {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        }
-        /*
-        * Service Description creation and saving
-        */
-        String serviceName = "SimpleEcho4";
-        ServiceDescription serv = new ServiceDescription();
-        serv.getType().setName(serviceName);
-
-        List<InputParameterType> inputList = new ArrayList<InputParameterType>();
-        List<OutputParameterType> outputList = new ArrayList<OutputParameterType>();
-
-
-        InputParameterType input = InputParameterType.Factory.newInstance();
-        input.setParameterName("echo_input");
-        ParameterType parameterType = input.addNewParameterType();
-        parameterType.setType(DataType.STRING);
-        parameterType.setName("String");
-
-        OutputParameterType output = OutputParameterType.Factory.newInstance();
-        output.setParameterName("echo_output");
-        ParameterType parameterType1 = output.addNewParameterType();
-        parameterType1.setType(DataType.STRING);
-        parameterType1.setName("String");
-
-        inputList.add(input);
-        outputList.add(output);
-
-        InputParameterType[] inputParamList = inputList.toArray(new InputParameterType[inputList.size()]);
-        OutputParameterType[] outputParamList = outputList.toArray(new OutputParameterType[outputList.size()]);
-
-        serv.getType().setInputParametersArray(inputParamList);
-        serv.getType().setOutputParametersArray(outputParamList);
-        try {
-            airavataAPI.getApplicationManager().saveServiceDescription(serv);
-        } catch (AiravataAPIInvocationException e) {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        }
-
-        /*
-           Application descriptor creation and saving
-        */
-        ApplicationDescription appDesc = new ApplicationDescription(HpcApplicationDeploymentType.type);
-        HpcApplicationDeploymentType app = (HpcApplicationDeploymentType) appDesc.getType();
-        ApplicationDeploymentDescriptionType.ApplicationName name = ApplicationDeploymentDescriptionType.ApplicationName.Factory.newInstance();
-        name.setStringValue("EchoLocal");
-        app.setApplicationName(name);
-        ProjectAccountType projectAccountType = app.addNewProjectAccount();
-        projectAccountType.setProjectAccountNumber("TG-STA110014S");
-
-        QueueType queueType = app.addNewQueue();
-        queueType.setQueueName("normal");
-
-        app.setCpuCount(1);
-        app.setJobType(JobTypeType.SERIAL);
-        app.setNodeCount(1);
-        app.setProcessorsPerNode(1);
-        app.setMaxWallTime(10);
-        /*
-        * Use bat file if it is compiled on Windows
-        */
-        app.setExecutableLocation("/bin/echo");
-
-        /*
-        * Default tmp location
-        */
-        String tempDir = "/home1/01437/ogce";
-
-
-        app.setScratchWorkingDirectory(tempDir);
-        app.setInstalledParentPath("/opt/sge6.2/bin/lx24-amd64/");
-
-        try {
-            airavataAPI.getApplicationManager().saveApplicationDescription(serviceName, lonestarHostAddress, appDesc);
-        } catch (AiravataAPIInvocationException e) {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        }
-    }
-
-	public void createEchoHostDocs() {
-		String serviceName = "Echo";
-		ServiceDescription serviceDescription = new ServiceDescription();
-		List<InputParameterType> inputParameters = new ArrayList<InputParameterType>();
-		List<OutputParameterType> outputParameters = new ArrayList<OutputParameterType>();
-		serviceDescription.getType().setName(serviceName);
-		serviceDescription.getType().setDescription("Echo service");
-		// Creating input parameters
-		InputParameterType parameter = InputParameterType.Factory.newInstance();
-		parameter.setParameterName("echo_input");
-		parameter.setParameterDescription("echo input");
-		ParameterType parameterType = parameter.addNewParameterType();
-		parameterType.setType(DataType.STRING);
-		parameterType.setName("String");
-		inputParameters.add(parameter);
-
-		// Creating output parameters
-		OutputParameterType outputParameter = OutputParameterType.Factory.newInstance();
-		outputParameter.setParameterName("echo_output");
-		outputParameter.setParameterDescription("Echo output");
-		ParameterType outputParaType = outputParameter.addNewParameterType();
-		outputParaType.setType(DataType.STRING);
-		outputParaType.setName("String");
-		outputParameters.add(outputParameter);
-
-		// Setting input and output parameters to serviceDescriptor
-		serviceDescription.getType().setInputParametersArray(inputParameters.toArray(new InputParameterType[] {}));
-		serviceDescription.getType().setOutputParametersArray(outputParameters.toArray(new OutputParameterType[] {}));
-
-		try {
-			airavataAPI.getApplicationManager().saveServiceDescription(serviceDescription);
-		} catch (AiravataAPIInvocationException e) {
-			e.printStackTrace(); // To change body of catch statement use File |
-									// Settings | File Templates.
-		}
-		// Localhost
-		ApplicationDescription applicationDeploymentDescription = new ApplicationDescription();
-		ApplicationDeploymentDescriptionType applicationDeploymentDescriptionType = applicationDeploymentDescription.getType();
-		applicationDeploymentDescriptionType.addNewApplicationName().setStringValue(serviceName);
-		applicationDeploymentDescriptionType.setExecutableLocation("/bin/echo");
-		applicationDeploymentDescriptionType.setScratchWorkingDirectory("/tmp");
-
-		try {
-			airavataAPI.getApplicationManager().saveApplicationDescription(serviceName, "localhost", applicationDeploymentDescription);
-		} catch (AiravataAPIInvocationException e) {
-			e.printStackTrace(); // To change body of catch statement use File |
-									// Settings | File Templates.
-		}
-		// Stampede
-		/*
-		 * Application descriptor creation and saving
-		 */
-		ApplicationDescription appDesc1 = new ApplicationDescription(HpcApplicationDeploymentType.type);
-		HpcApplicationDeploymentType app1 = (HpcApplicationDeploymentType) appDesc1.getType();
-		ApplicationDeploymentDescriptionType.ApplicationName name = ApplicationDeploymentDescriptionType.ApplicationName.Factory.newInstance();
-		name.setStringValue(serviceName);
-		app1.setApplicationName(name);
-		ProjectAccountType projectAccountType = app1.addNewProjectAccount();
-		projectAccountType.setProjectAccountNumber("TG-STA110014S");
-
-		QueueType queueType = app1.addNewQueue();
-		queueType.setQueueName("normal");
-
-		app1.setCpuCount(1);
-		app1.setJobType(JobTypeType.SERIAL);
-		app1.setNodeCount(1);
-		app1.setProcessorsPerNode(1);
-		app1.setMaxWallTime(10);
-		/*
-		 * Use bat file if it is compiled on Windows
-		 */
-		app1.setExecutableLocation("/bin/echo");
-
-		/*
-		 * Default tmp location
-		 */
-		String tempDir = "/home1/01437/ogce";
-
-		app1.setScratchWorkingDirectory(tempDir);
-		app1.setInstalledParentPath("/usr/bin/");
-
-		try {
-			airavataAPI.getApplicationManager().saveApplicationDescription(serviceName, stampedeHostAddress, appDesc1);
-		} catch (AiravataAPIInvocationException e) {
-			e.printStackTrace(); // To change body of catch statement use File |
-									// Settings | File Templates.
-		}
-		// Trestles
-		/*
-		 * Application descriptor creation and saving
-		 */
-		ApplicationDescription appDesc2 = new ApplicationDescription(HpcApplicationDeploymentType.type);
-		HpcApplicationDeploymentType app2 = (HpcApplicationDeploymentType) appDesc2.getType();
-		ApplicationDeploymentDescriptionType.ApplicationName name2 = ApplicationDeploymentDescriptionType.ApplicationName.Factory.newInstance();
-		name2.setStringValue(serviceName);
-		app2.setApplicationName(name);
-		ProjectAccountType projectAccountType2 = app2.addNewProjectAccount();
-		projectAccountType2.setProjectAccountNumber("sds128");
-
-		QueueType queueType2 = app2.addNewQueue();
-		queueType2.setQueueName("normal");
-
-		app2.setCpuCount(1);
-		app2.setJobType(JobTypeType.SERIAL);
-		app2.setNodeCount(1);
-		app2.setProcessorsPerNode(1);
-		app2.setMaxWallTime(10);
-		/*
-		 * Use bat file if it is compiled on Windows
-		 */
-		app2.setExecutableLocation("/bin/echo");
-
-		/*
-		 * Default tmp location
-		 */
-		String tempDir2 = "/home/ogce/scratch";
-
-		app2.setScratchWorkingDirectory(tempDir2);
-		app2.setInstalledParentPath("/opt/torque/bin/");
-
-		try {
-			airavataAPI.getApplicationManager().saveApplicationDescription(serviceName, trestleshpcHostAddress, appDesc2);
-		} catch (AiravataAPIInvocationException e) {
-			e.printStackTrace(); // To change body of catch statement use File |
-									// Settings | File Templates.
-		}
-		// Lonestar
-		/*
-		 * Application descriptor creation and saving
-		 */
-		ApplicationDescription appDesc3 = new ApplicationDescription(HpcApplicationDeploymentType.type);
-		HpcApplicationDeploymentType app3 = (HpcApplicationDeploymentType) appDesc3.getType();
-		ApplicationDeploymentDescriptionType.ApplicationName name3 = ApplicationDeploymentDescriptionType.ApplicationName.Factory.newInstance();
-		name3.setStringValue(serviceName);
-		app3.setApplicationName(name);
-		ProjectAccountType projectAccountType3 = app3.addNewProjectAccount();
-		projectAccountType3.setProjectAccountNumber("TG-STA110014S");
-
-		QueueType queueType3 = app3.addNewQueue();
-		queueType3.setQueueName("normal");
-
-		app3.setCpuCount(1);
-		app3.setJobType(JobTypeType.SERIAL);
-		app3.setNodeCount(1);
-		app3.setProcessorsPerNode(1);
-		app3.setMaxWallTime(10);
-		/*
-		 * Use bat file if it is compiled on Windows
-		 */
-		app3.setExecutableLocation("/bin/echo");
-
-		/*
-		 * Default tmp location
-		 */
-		String tempDir3 = "/home1/01437/ogce";
-
-		app3.setScratchWorkingDirectory(tempDir3);
-		app3.setInstalledParentPath("/opt/sge6.2/bin/lx24-amd64/");
-
-		try {
-			airavataAPI.getApplicationManager().saveApplicationDescription(serviceName, lonestarHostAddress, appDesc3);
-		} catch (AiravataAPIInvocationException e) {
-			e.printStackTrace(); // To change body of catch statement use File |
-									// Settings | File Templates.
-		}
-
-	}
-    public AiravataAPI getAiravataAPI() {
-        return airavataAPI;
-    }
-
-    public void setAiravataAPI(AiravataAPI airavataAPI) {
-        this.airavataAPI = airavataAPI;
-    }
+//
+//         /*
+//        * Service Description creation and saving
+//        */
+//        String wrfserviceName = "WRF";
+//        ServiceDescription wrfServ = new ServiceDescription();
+//        wrfServ.getType().setName(wrfserviceName);
+//
+//        List<InputParameterType> wrfinputList = new ArrayList<InputParameterType>();
+//        List<OutputParameterType> wrfoutputList = new ArrayList<OutputParameterType>();
+//
+//
+//        InputParameterType wrfinput1 = InputParameterType.Factory.newInstance();
+//        wrfinput1.setParameterName("WRF_Namelist");
+//        ParameterType wrfparameterType1 = wrfinput1.addNewParameterType();
+//        wrfparameterType1.setType(DataType.URI);
+//        wrfparameterType1.setName("URI");
+//
+//        InputParameterType wrfinput2 = InputParameterType.Factory.newInstance();
+//        wrfinput2.setParameterName("WRF_Input_File");
+//        ParameterType wrfparameterType2 = wrfinput2.addNewParameterType();
+//        wrfparameterType2.setType(DataType.URI);
+//        wrfparameterType2.setName("URI");
+//
+//        InputParameterType wrfinput3 = InputParameterType.Factory.newInstance();
+//        wrfinput3.setParameterName("WRF_Boundary_File");
+//        ParameterType wrfparameterType3 = wrfinput3.addNewParameterType();
+//        wrfparameterType3.setType(DataType.URI);
+//        wrfparameterType3.setName("URI");
+//
+//        OutputParameterType wrfOutput1 = OutputParameterType.Factory.newInstance();
+//        wrfOutput1.setParameterName("WRF_Output");
+//        ParameterType wrfoutparameterType1 = wrfOutput1.addNewParameterType();
+//        wrfoutparameterType1.setType(DataType.URI);
+//        wrfoutparameterType1.setName("URI");
+//
+//        OutputParameterType wrfOutput2 = OutputParameterType.Factory.newInstance();
+//        wrfOutput2.setParameterName("WRF_Execution_Log");
+//        ParameterType wrfoutparameterType2 = wrfOutput2.addNewParameterType();
+//        wrfoutparameterType2.setType(DataType.URI);
+//        wrfoutparameterType2.setName("URI");
+//
+//        wrfinputList.add(wrfinput1);
+//        wrfinputList.add(wrfinput2);
+//        wrfinputList.add(wrfinput3);
+//        wrfoutputList.add(wrfOutput1);
+//        wrfoutputList.add(wrfOutput2);
+//
+//        InputParameterType[] wrfinputParamList = wrfinputList.toArray(new InputParameterType[wrfinputList.size()]);
+//        OutputParameterType[] wrfoutputParamList = wrfoutputList.toArray(new OutputParameterType[wrfoutputList.size()]);
+//
+//        wrfServ.getType().setInputParametersArray(wrfinputParamList);
+//        wrfServ.getType().setOutputParametersArray(wrfoutputParamList);
+//        try {
+//            airavataAPI.getApplicationManager().saveServiceDescription(wrfServ);
+//        } catch (AiravataAPIInvocationException e) {
+//            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+//        }
+//
+//        /*
+//            Application descriptor creation and saving
+//         */
+//        ApplicationDescription wrfAppDesc = new ApplicationDescription(HpcApplicationDeploymentType.type);
+//        HpcApplicationDeploymentType wrfApp = (HpcApplicationDeploymentType) wrfAppDesc.getType();
+//        ApplicationDeploymentDescriptionType.ApplicationName wrfName = ApplicationDeploymentDescriptionType.ApplicationName.Factory.newInstance();
+//        wrfName.setStringValue("WRF");
+//        wrfApp.setApplicationName(wrfName);
+//        ProjectAccountType wrfprojectAccountType = wrfApp.addNewProjectAccount();
+//        wrfprojectAccountType.setProjectAccountNumber("sds128");
+//
+//        QueueType wrfQueueType = wrfApp.addNewQueue();
+//        wrfQueueType.setQueueName("normal");
+//
+//        wrfApp.setCpuCount(32);
+//        wrfApp.setJobType(JobTypeType.MPI);
+//        wrfApp.setNodeCount(2);
+//        wrfApp.setProcessorsPerNode(1);
+//        wrfApp.setMaxWallTime(30);
+//        /*
+//           * Use bat file if it is compiled on Windows
+//           */
+//        wrfApp.setExecutableLocation("/home/ogce/apps/wrf_wrapper.sh");
+//
+//        /*
+//           * Default tmp location
+//           */
+//        String wrfTempDir = "/oasis/scratch/trestles/ogce/temp_project/";
+//
+//        wrfApp.setScratchWorkingDirectory(wrfTempDir);
+//        wrfApp.setInstalledParentPath("/opt/torque/bin/");
+//
+//        try {
+//            airavataAPI.getApplicationManager().saveApplicationDescription(wrfserviceName, trestleshpcHostAddress, wrfAppDesc);
+//        } catch (AiravataAPIInvocationException e) {
+//            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+//        }
+//    }
+//
+//   
+//    public void createSlurmDocs() {
+//        HostDescription host = new HostDescription(GsisshHostType.type);
+//        host.getType().setHostAddress(stampedeHostAddress);
+//        host.getType().setHostName(stampedeHostAddress);
+//        ((GsisshHostType) host.getType()).setJobManager("slurm");
+//        ((GsisshHostType) host.getType()).setInstalledPath("/usr/bin/");
+//        ((GsisshHostType) host.getType()).setPort(2222);
+//        ((GsisshHostType) host.getType()).setMonitorMode("push");
+//    
+//
+//        try {
+//            airavataAPI.getApplicationManager().saveHostDescription(host);
+//        } catch (AiravataAPIInvocationException e) {
+//            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+//        }
+//        /*
+//        * Service Description creation and saving
+//        */
+//        String serviceName = "SimpleEcho3";
+//        ServiceDescription serv = new ServiceDescription();
+//        serv.getType().setName(serviceName);
+//
+//        List<InputParameterType> inputList = new ArrayList<InputParameterType>();
+//        List<OutputParameterType> outputList = new ArrayList<OutputParameterType>();
+//
+//
+//        InputParameterType input = InputParameterType.Factory.newInstance();
+//        input.setParameterName("echo_input");
+//        ParameterType parameterType = input.addNewParameterType();
+//        parameterType.setType(DataType.STRING);
+//        parameterType.setName("String");
+//
+//        OutputParameterType output = OutputParameterType.Factory.newInstance();
+//        output.setParameterName("echo_output");
+//        ParameterType parameterType1 = output.addNewParameterType();
+//        parameterType1.setType(DataType.STRING);
+//        parameterType1.setName("String");
+//
+//        inputList.add(input);
+//        outputList.add(output);
+//
+//        InputParameterType[] inputParamList = inputList.toArray(new InputParameterType[inputList.size()]);
+//        OutputParameterType[] outputParamList = outputList.toArray(new OutputParameterType[outputList.size()]);
+//
+//        serv.getType().setInputParametersArray(inputParamList);
+//        serv.getType().setOutputParametersArray(outputParamList);
+//        try {
+//            airavataAPI.getApplicationManager().saveServiceDescription(serv);
+//        } catch (AiravataAPIInvocationException e) {
+//            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+//        }
+//
+//        /*
+//           Application descriptor creation and saving
+//        */
+//        ApplicationDescription appDesc = new ApplicationDescription(HpcApplicationDeploymentType.type);
+//        HpcApplicationDeploymentType app = (HpcApplicationDeploymentType) appDesc.getType();
+//        ApplicationDeploymentDescriptionType.ApplicationName name = ApplicationDeploymentDescriptionType.ApplicationName.Factory.newInstance();
+//        name.setStringValue("EchoLocal");
+//        app.setApplicationName(name);
+//        ProjectAccountType projectAccountType = app.addNewProjectAccount();
+//        projectAccountType.setProjectAccountNumber("TG-STA110014S");
+//
+//        QueueType queueType = app.addNewQueue();
+//        queueType.setQueueName("normal");
+//
+//        app.setCpuCount(1);
+//        app.setJobType(JobTypeType.SERIAL);
+//        app.setNodeCount(1);
+//        app.setProcessorsPerNode(1);
+//        app.setMaxWallTime(10);
+//        /*
+//        * Use bat file if it is compiled on Windows
+//        */
+//        app.setExecutableLocation("/bin/echo");
+//
+//        /*
+//        * Default tmp location
+//        */
+//        String tempDir = "/home1/01437/ogce";
+//
+//
+//        app.setScratchWorkingDirectory(tempDir);
+//        app.setInstalledParentPath("/usr/bin/");
+//
+//        try {
+//            airavataAPI.getApplicationManager().saveApplicationDescription(serviceName, stampedeHostAddress, appDesc);
+//        } catch (AiravataAPIInvocationException e) {
+//            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+//        }
+//    }
+//
+//    public void createSGEDocs() {
+//        HostDescription host = new HostDescription(GsisshHostType.type);
+//        host.getType().setHostAddress(lonestarHostAddress);
+//        host.getType().setHostName(lonestarHostAddress);
+//        ((GsisshHostType) host.getType()).setJobManager("sge");
+//        ((GsisshHostType) host.getType()).setInstalledPath("/opt/sge6.2/bin/lx24-amd64/");
+//        ((GsisshHostType) host.getType()).setPort(22);
+//        try {
+//            airavataAPI.getApplicationManager().saveHostDescription(host);
+//        } catch (AiravataAPIInvocationException e) {
+//            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+//        }
+//        /*
+//        * Service Description creation and saving
+//        */
+//        String serviceName = "SimpleEcho4";
+//        ServiceDescription serv = new ServiceDescription();
+//        serv.getType().setName(serviceName);
+//
+//        List<InputParameterType> inputList = new ArrayList<InputParameterType>();
+//        List<OutputParameterType> outputList = new ArrayList<OutputParameterType>();
+//
+//
+//        InputParameterType input = InputParameterType.Factory.newInstance();
+//        input.setParameterName("echo_input");
+//        ParameterType parameterType = input.addNewParameterType();
+//        parameterType.setType(DataType.STRING);
+//        parameterType.setName("String");
+//
+//        OutputParameterType output = OutputParameterType.Factory.newInstance();
+//        output.setParameterName("echo_output");
+//        ParameterType parameterType1 = output.addNewParameterType();
+//        parameterType1.setType(DataType.STRING);
+//        parameterType1.setName("String");
+//
+//        inputList.add(input);
+//        outputList.add(output);
+//
+//        InputParameterType[] inputParamList = inputList.toArray(new InputParameterType[inputList.size()]);
+//        OutputParameterType[] outputParamList = outputList.toArray(new OutputParameterType[outputList.size()]);
+//
+//        serv.getType().setInputParametersArray(inputParamList);
+//        serv.getType().setOutputParametersArray(outputParamList);
+//        try {
+//            airavataAPI.getApplicationManager().saveServiceDescription(serv);
+//        } catch (AiravataAPIInvocationException e) {
+//            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+//        }
+//
+//        /*
+//           Application descriptor creation and saving
+//        */
+//        ApplicationDescription appDesc = new ApplicationDescription(HpcApplicationDeploymentType.type);
+//        HpcApplicationDeploymentType app = (HpcApplicationDeploymentType) appDesc.getType();
+//        ApplicationDeploymentDescriptionType.ApplicationName name = ApplicationDeploymentDescriptionType.ApplicationName.Factory.newInstance();
+//        name.setStringValue("EchoLocal");
+//        app.setApplicationName(name);
+//        ProjectAccountType projectAccountType = app.addNewProjectAccount();
+//        projectAccountType.setProjectAccountNumber("TG-STA110014S");
+//
+//        QueueType queueType = app.addNewQueue();
+//        queueType.setQueueName("normal");
+//
+//        app.setCpuCount(1);
+//        app.setJobType(JobTypeType.SERIAL);
+//        app.setNodeCount(1);
+//        app.setProcessorsPerNode(1);
+//        app.setMaxWallTime(10);
+//        /*
+//        * Use bat file if it is compiled on Windows
+//        */
+//        app.setExecutableLocation("/bin/echo");
+//
+//        /*
+//        * Default tmp location
+//        */
+//        String tempDir = "/home1/01437/ogce";
+//
+//
+//        app.setScratchWorkingDirectory(tempDir);
+//        app.setInstalledParentPath("/opt/sge6.2/bin/lx24-amd64/");
+//
+//        try {
+//            airavataAPI.getApplicationManager().saveApplicationDescription(serviceName, lonestarHostAddress, appDesc);
+//        } catch (AiravataAPIInvocationException e) {
+//            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+//        }
+//    }
+//
+//	public void createEchoHostDocs() {
+//		String serviceName = "Echo";
+//		ServiceDescription serviceDescription = new ServiceDescription();
+//		List<InputParameterType> inputParameters = new ArrayList<InputParameterType>();
+//		List<OutputParameterType> outputParameters = new ArrayList<OutputParameterType>();
+//		serviceDescription.getType().setName(serviceName);
+//		serviceDescription.getType().setDescription("Echo service");
+//		// Creating input parameters
+//		InputParameterType parameter = InputParameterType.Factory.newInstance();
+//		parameter.setParameterName("echo_input");
+//		parameter.setParameterDescription("echo input");
+//		ParameterType parameterType = parameter.addNewParameterType();
+//		parameterType.setType(DataType.STRING);
+//		parameterType.setName("String");
+//		inputParameters.add(parameter);
+//
+//		// Creating output parameters
+//		OutputParameterType outputParameter = OutputParameterType.Factory.newInstance();
+//		outputParameter.setParameterName("echo_output");
+//		outputParameter.setParameterDescription("Echo output");
+//		ParameterType outputParaType = outputParameter.addNewParameterType();
+//		outputParaType.setType(DataType.STRING);
+//		outputParaType.setName("String");
+//		outputParameters.add(outputParameter);
+//
+//		// Setting input and output parameters to serviceDescriptor
+//		serviceDescription.getType().setInputParametersArray(inputParameters.toArray(new InputParameterType[] {}));
+//		serviceDescription.getType().setOutputParametersArray(outputParameters.toArray(new OutputParameterType[] {}));
+//
+//		try {
+//			airavataAPI.getApplicationManager().saveServiceDescription(serviceDescription);
+//		} catch (AiravataAPIInvocationException e) {
+//			e.printStackTrace(); // To change body of catch statement use File |
+//									// Settings | File Templates.
+//		}
+//		// Localhost
+//		ApplicationDescription applicationDeploymentDescription = new ApplicationDescription();
+//		ApplicationDeploymentDescriptionType applicationDeploymentDescriptionType = applicationDeploymentDescription.getType();
+//		applicationDeploymentDescriptionType.addNewApplicationName().setStringValue(serviceName);
+//		applicationDeploymentDescriptionType.setExecutableLocation("/bin/echo");
+//		applicationDeploymentDescriptionType.setScratchWorkingDirectory("/tmp");
+//
+//		try {
+//			airavataAPI.getApplicationManager().saveApplicationDescription(serviceName, "localhost", applicationDeploymentDescription);
+//		} catch (AiravataAPIInvocationException e) {
+//			e.printStackTrace(); // To change body of catch statement use File |
+//									// Settings | File Templates.
+//		}
+//		// Stampede
+//		/*
+//		 * Application descriptor creation and saving
+//		 */
+//		ApplicationDescription appDesc1 = new ApplicationDescription(HpcApplicationDeploymentType.type);
+//		HpcApplicationDeploymentType app1 = (HpcApplicationDeploymentType) appDesc1.getType();
+//		ApplicationDeploymentDescriptionType.ApplicationName name = ApplicationDeploymentDescriptionType.ApplicationName.Factory.newInstance();
+//		name.setStringValue(serviceName);
+//		app1.setApplicationName(name);
+//		ProjectAccountType projectAccountType = app1.addNewProjectAccount();
+//		projectAccountType.setProjectAccountNumber("TG-STA110014S");
+//
+//		QueueType queueType = app1.addNewQueue();
+//		queueType.setQueueName("normal");
+//
+//		app1.setCpuCount(1);
+//		app1.setJobType(JobTypeType.SERIAL);
+//		app1.setNodeCount(1);
+//		app1.setProcessorsPerNode(1);
+//		app1.setMaxWallTime(10);
+//		/*
+//		 * Use bat file if it is compiled on Windows
+//		 */
+//		app1.setExecutableLocation("/bin/echo");
+//
+//		/*
+//		 * Default tmp location
+//		 */
+//		String tempDir = "/home1/01437/ogce";
+//
+//		app1.setScratchWorkingDirectory(tempDir);
+//		app1.setInstalledParentPath("/usr/bin/");
+//
+//		try {
+//			airavataAPI.getApplicationManager().saveApplicationDescription(serviceName, stampedeHostAddress, appDesc1);
+//		} catch (AiravataAPIInvocationException e) {
+//			e.printStackTrace(); // To change body of catch statement use File |
+//									// Settings | File Templates.
+//		}
+//		// Trestles
+//		/*
+//		 * Application descriptor creation and saving
+//		 */
+//		ApplicationDescription appDesc2 = new ApplicationDescription(HpcApplicationDeploymentType.type);
+//		HpcApplicationDeploymentType app2 = (HpcApplicationDeploymentType) appDesc2.getType();
+//		ApplicationDeploymentDescriptionType.ApplicationName name2 = ApplicationDeploymentDescriptionType.ApplicationName.Factory.newInstance();
+//		name2.setStringValue(serviceName);
+//		app2.setApplicationName(name);
+//		ProjectAccountType projectAccountType2 = app2.addNewProjectAccount();
+//		projectAccountType2.setProjectAccountNumber("sds128");
+//
+//		QueueType queueType2 = app2.addNewQueue();
+//		queueType2.setQueueName("normal");
+//
+//		app2.setCpuCount(1);
+//		app2.setJobType(JobTypeType.SERIAL);
+//		app2.setNodeCount(1);
+//		app2.setProcessorsPerNode(1);
+//		app2.setMaxWallTime(10);
+//		/*
+//		 * Use bat file if it is compiled on Windows
+//		 */
+//		app2.setExecutableLocation("/bin/echo");
+//
+//		/*
+//		 * Default tmp location
+//		 */
+//		String tempDir2 = "/home/ogce/scratch";
+//
+//		app2.setScratchWorkingDirectory(tempDir2);
+//		app2.setInstalledParentPath("/opt/torque/bin/");
+//
+//		try {
+//			airavataAPI.getApplicationManager().saveApplicationDescription(serviceName, trestleshpcHostAddress, appDesc2);
+//		} catch (AiravataAPIInvocationException e) {
+//			e.printStackTrace(); // To change body of catch statement use File |
+//									// Settings | File Templates.
+//		}
+//		// Lonestar
+//		/*
+//		 * Application descriptor creation and saving
+//		 */
+//		ApplicationDescription appDesc3 = new ApplicationDescription(HpcApplicationDeploymentType.type);
+//		HpcApplicationDeploymentType app3 = (HpcApplicationDeploymentType) appDesc3.getType();
+//		ApplicationDeploymentDescriptionType.ApplicationName name3 = ApplicationDeploymentDescriptionType.ApplicationName.Factory.newInstance();
+//		name3.setStringValue(serviceName);
+//		app3.setApplicationName(name);
+//		ProjectAccountType projectAccountType3 = app3.addNewProjectAccount();
+//		projectAccountType3.setProjectAccountNumber("TG-STA110014S");
+//
+//		QueueType queueType3 = app3.addNewQueue();
+//		queueType3.setQueueName("normal");
+//
+//		app3.setCpuCount(1);
+//		app3.setJobType(JobTypeType.SERIAL);
+//		app3.setNodeCount(1);
+//		app3.setProcessorsPerNode(1);
+//		app3.setMaxWallTime(10);
+//		/*
+//		 * Use bat file if it is compiled on Windows
+//		 */
+//		app3.setExecutableLocation("/bin/echo");
+//
+//		/*
+//		 * Default tmp location
+//		 */
+//		String tempDir3 = "/home1/01437/ogce";
+//
+//		app3.setScratchWorkingDirectory(tempDir3);
+//		app3.setInstalledParentPath("/opt/sge6.2/bin/lx24-amd64/");
+//
+//		try {
+//			airavataAPI.getApplicationManager().saveApplicationDescription(serviceName, lonestarHostAddress, appDesc3);
+//		} catch (AiravataAPIInvocationException e) {
+//			e.printStackTrace(); // To change body of catch statement use File |
+//									// Settings | File Templates.
+//		}
+//
+//	}
+//    public AiravataAPI getAiravataAPI() {
+//        return airavataAPI;
+//    }
+//
+//    public void setAiravataAPI(AiravataAPI airavataAPI) {
+//        this.airavataAPI = airavataAPI;
+//    }
 }
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/c42adb46/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/JobManagerCommand.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/JobManagerCommand.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/JobManagerCommand.java
new file mode 100644
index 0000000..ec64d4b
--- /dev/null
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/JobManagerCommand.java
@@ -0,0 +1,89 @@
+/*
+ *
+ * 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;
+
+import org.apache.openjpa.persistence.DataCache;
+
+@DataCache
+@Entity
+@Table(name = "JOB_MANAGER_COMMAND")
+@IdClass(JobManagerCommand_PK.class)
+public class JobManagerCommand implements Serializable {
+	
+	@Id
+	@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 = "COMMAND_TYPE")
+	private String commandType;
+	
+	@Column(name = "COMMAND")
+	private String command;
+	
+	public String getResourceJobManagerId() {
+		return resourceJobManagerId;
+	}
+	
+	public ResourceJobManager getResourceJobManager() {
+		return resourceJobManager;
+	}
+	
+	public String getCommandType() {
+		return commandType;
+	}
+	
+	public String getCommand() {
+		return command;
+	}
+	
+	public void setResourceJobManagerId(String resourceJobManagerId) {
+		this.resourceJobManagerId=resourceJobManagerId;
+	}
+	
+	public void setResourceJobManager(ResourceJobManager resourceJobManager) {
+		this.resourceJobManager=resourceJobManager;
+	}
+	
+	public void setCommandType(String commandType) {
+		this.commandType=commandType;
+	}
+	
+	public void setCommand(String command) {
+		this.command=command;
+	}
+}

http://git-wip-us.apache.org/repos/asf/airavata/blob/c42adb46/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/JobManagerCommand_PK.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/JobManagerCommand_PK.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/JobManagerCommand_PK.java
new file mode 100644
index 0000000..f82a452
--- /dev/null
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/JobManagerCommand_PK.java
@@ -0,0 +1,59 @@
+/*
+ *
+ * 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 JobManagerCommand_PK implements Serializable {
+	private String resourceJobManagerId;
+	private String commandType;
+	public JobManagerCommand_PK(String resourceJobManagerId, String commandType){
+		this.resourceJobManagerId = resourceJobManagerId;
+		this.commandType = commandType;
+	}
+	
+	@Override
+	public boolean equals(Object o) {
+		return false;
+	}
+	
+	@Override
+	public int hashCode() {
+		return 1;
+	}
+	
+	public String getResourceJobManagerId() {
+		return resourceJobManagerId;
+	}
+	
+	public String getCommandType() {
+		return commandType;
+	}
+	
+	public void setResourceJobManagerId(String resourceJobManagerId) {
+		this.resourceJobManagerId=resourceJobManagerId;
+	}
+	
+	public void setCommandType(String commandType) {
+		this.commandType=commandType;
+	}
+}

http://git-wip-us.apache.org/repos/asf/airavata/blob/c42adb46/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
new file mode 100644
index 0000000..ab485f8
--- /dev/null
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ResourceJobManager.java
@@ -0,0 +1,83 @@
+/*
+ *
+ * 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.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;
+	
+	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/c42adb46/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
index cc25d9d..b718ad9 100644
--- 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
@@ -53,6 +53,8 @@ public abstract class AbstractResource implements Resource {
 	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";
 	
     // Compute Resource Table
     public final class ComputeResourceConstants {
@@ -263,4 +265,19 @@ public abstract class AbstractResource implements Resource {
 		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";
+	}
 }


Mime
View raw message