airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msme...@apache.org
Subject [5/5] airavata git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Date Wed, 10 Dec 2014 12:38:16 GMT
Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata

Conflicts:
	airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java


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

Branch: refs/heads/master
Commit: 5b118f8c41580d79dfb5707814cac1c628fa2b07
Parents: 6644942 d35226d
Author: msmemon <shahbaz.memon@gmail.com>
Authored: Wed Dec 10 13:41:18 2014 +0100
Committer: msmemon <shahbaz.memon@gmail.com>
Committed: Wed Dec 10 13:41:18 2014 +0100

----------------------------------------------------------------------
 .../applicationInterfaceModel_types.cpp         | 212 ++++++++--
 .../airavata/applicationInterfaceModel_types.h  | 124 +++++-
 .../lib/airavata/experimentModel_types.cpp      |  12 +-
 .../lib/airavata/experimentModel_types.h        |  12 +-
 .../lib/airavata/messagingEvents_types.cpp      |   4 +-
 .../lib/airavata/messagingEvents_types.h        |   4 +-
 .../lib/airavata/workflowDataModel_types.cpp    |   4 +-
 .../lib/airavata/workflowDataModel_types.h      |   4 +-
 .../Model/AppCatalog/AppInterface/Types.php     | 167 ++++++++
 .../client/samples/RegisterSampleData.java      |  14 +-
 .../tools/RegisterOGCEUS3Application.java       |   2 +-
 .../tools/RegisterSampleApplications.java       |  85 ++--
 .../tools/RegisterSampleApplicationsUtils.java  |   3 +-
 .../client/tools/RegisterUS3Application.java    |   2 +-
 .../appinterface/InputDataObjectType.java       | 424 ++++++++++++++++++-
 .../appinterface/OutputDataObjectType.java      | 320 +++++++++++++-
 .../airavata/model/util/AppInterfaceUtil.java   |   2 +
 .../applicationInterfaceModel.thrift            |  29 +-
 .../data/impl/ApplicationInterfaceImpl.java     |   6 +-
 .../catalog/data/impl/WorkflowCatalogImpl.java  |   4 +-
 .../catalog/data/model/ApplicationInput.java    |  40 ++
 .../catalog/data/model/ApplicationOutput.java   |  30 ++
 .../catalog/data/model/WorkflowInput.java       |  44 +-
 .../catalog/data/model/WorkflowOutput.java      |  30 ++
 .../resources/ApplicationInputResource.java     |  52 ++-
 .../resources/ApplicationOutputResource.java    |  30 ++
 .../data/resources/WorkflowInputResource.java   |  51 ++-
 .../data/resources/WorkflowOutputResource.java  |  33 ++
 .../catalog/data/util/AppCatalogJPAUtils.java   |  18 +-
 .../data/util/AppCatalogThriftConversion.java   |  28 +-
 .../src/main/resources/appcatalog-derby.sql     |   7 +
 .../src/main/resources/appcatalog-mysql.sql     |   7 +
 .../app/catalog/test/AppInterfaceTest.java      |   2 +
 .../src/test/resources/appcatalog-derby.sql     |   7 +
 .../gfac/local/provider/impl/LocalProvider.java |  41 +-
 .../registry/jpa/impl/ExperimentRegistry.java   |  38 +-
 .../registry/jpa/model/ApplicationInput.java    |  86 +++-
 .../registry/jpa/model/ApplicationOutput.java   |  53 ++-
 .../registry/jpa/model/Experiment_Input.java    |  87 +++-
 .../registry/jpa/model/Experiment_Output.java   |  53 ++-
 .../registry/jpa/model/NodeInput.java           |  85 +++-
 .../registry/jpa/model/NodeOutput.java          |  53 ++-
 .../jpa/resources/ApplicationInputResource.java |  91 +++-
 .../resources/ApplicationOutputResource.java    |  58 ++-
 .../jpa/resources/ExperimentInputResource.java  |  92 +++-
 .../jpa/resources/ExperimentOutputResource.java |  58 ++-
 .../jpa/resources/NodeInputResource.java        |  92 +++-
 .../jpa/resources/NodeOutputResource.java       |  58 ++-
 .../registry/jpa/resources/Utils.java           |  46 +-
 .../jpa/utils/ThriftDataModelConversion.java    |  79 +++-
 .../src/main/resources/registry-derby.sql       |  45 +-
 .../src/main/resources/registry-mysql.sql       |  45 +-
 .../jpa/ExperimentInputResourceTest.java        |   2 +-
 .../jpa/ExperimentOutputResourceTest.java       |   2 +-
 .../src/test/resources/registry-derby.sql       |  45 +-
 .../engine/interpretor/WorkflowInterpreter.java |  14 +-
 .../model/component/ws/WSComponent.java         |   3 +-
 .../component/ws/WSComponentApplication.java    |  97 +++--
 .../ws/WSComponentApplicationParameter.java     |  39 +-
 .../model/component/ws/WSComponentPort.java     |  23 +-
 .../workflow/model/gpel/script/BPELScript.java  |   2 +-
 .../model/gpel/script/WorkflowWSDL.java         |   3 +-
 .../workflow/model/graph/GraphSchema.java       |   1 +
 .../workflow/model/graph/system/InputNode.java  |  23 +-
 .../workflow/model/utils/WorkflowConstants.java |  16 +-
 .../registry/ComponentRegistryLoader.java       |   9 +-
 .../graph/system/InputConfigurationDialog.java  |  91 ++--
 .../WorkflowInterpreterLaunchWindow.java        |   3 +
 68 files changed, 2860 insertions(+), 486 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/5b118f8c/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
----------------------------------------------------------------------
diff --cc airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
index 9a2aaf7,e4e1e32..18408b7
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
@@@ -536,25 -529,17 +536,26 @@@ public class RegisterSampleApplication
              List<String> appModules = new ArrayList<String>();
              appModules.add(echoModuleId);
  
 -            InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Input_to_Echo",
"Hello World",
++
 +            InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Input_to_Echo",
"",
-                     DataType.STRING, null, false, "A test string to Echo", null);
+                     DataType.STRING, null, 1, false, "A test string to Echo", null);
              
 +            InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("Input_to_Echo2",
"",
-                     DataType.URI, null, false, "A sample input remote file", null);
++                    DataType.URI, null, 2, false, "A sample input remote file", null);
 +
 +            InputDataObjectType input3 = RegisterSampleApplicationsUtils.createAppInput("Input_to_Echo3",
"file:///tmp/test.txt",
-                     DataType.URI, null, false, "A sample input local file", null);
++                    DataType.URI, null, 3, false, "A sample input local file", null);
 +
 +            
              List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
--            applicationInputs.add(input1);
++            applicationInputs.add(input1); applicationInputs.add(input2); applicationInputs.add(input3);
  
              OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("Echoed_Output",
 -                    "22QmrrX4", DataType.STRING);
 -
 +                    "", DataType.STRING);
 +            
              List<OutputDataObjectType> applicationOutputs = new ArrayList<OutputDataObjectType>();
              applicationOutputs.add(output1);
 +            
  
              echoInterfaceId = airavataClient.registerApplicationInterface(
                      RegisterSampleApplicationsUtils.createApplicationInterfaceDescription(echoName,
echoDescription,
@@@ -565,39 -550,7 +566,39 @@@
              e.printStackTrace();
          }
      }
 +    
 +    
 +    public void registerMPIInterface() {
 +        try {
 +            System.out.println("#### Registering MPI Interface #### \n");
 +            
 +            List<String> appModules = new ArrayList<String>();
 +            appModules.add(mpiModuleId);
  
 +            InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Sample_Input",
"",
-                     DataType.STRING, null, false, "An optional MPI source file", null);
++                    DataType.STRING, null, 1, false, "An optional MPI source file", null);
 +            
 +            List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
 +            applicationInputs.add(input1);
 +            
 +            OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("Sample_Output",
 +                    "", DataType.STRING);
 +            
 +            List<OutputDataObjectType> applicationOutputs = new ArrayList<OutputDataObjectType>();
 +            applicationOutputs.add(output1);
 + 
 +            
 +            mpiInterfaceId = airavataClient.registerApplicationInterface(
 +                    RegisterSampleApplicationsUtils.createApplicationInterfaceDescription(mpiName,
mpiDescription,
 +                            appModules, applicationInputs, applicationOutputs));
 +            System.out.println("MPI Application Interface Id " + mpiInterfaceId);
 +
 +        } catch (TException e) {
 +            e.printStackTrace();
 +        }
 +    }
 +
 +    
      public void registerAmberInterface() {
          try {
              System.out.println("#### Registering Amber Interface #### \n");


Mime
View raw message