Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/44c72f4d Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/44c72f4d Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/44c72f4d Branch: refs/heads/master Commit: 44c72f4d45374daa9e189f28356d964305616704 Parents: a133fa8 91f5de5 Author: raminder <[email protected]> Authored: Wed Nov 5 16:05:00 2014 -0500 Committer: raminder <[email protected]> Committed: Wed Nov 5 16:05:00 2014 -0500 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 65 + .../java/org/apache/airavata/api/Airavata.java | 48734 ++++++++++------- .../java/org/apache/airavata/api/Workflow.java | 32 +- .../main/resources/lib/airavata/Airavata.cpp | 8909 ++- .../src/main/resources/lib/airavata/Airavata.h | 1377 +- .../lib/airavata/Airavata_server.skeleton.cpp | 45 + .../main/resources/lib/airavata/Workflow.cpp | 34 +- .../resources/lib/Airavata/API/Airavata.php | 10312 ++-- .../resources/lib/Airavata/API/Workflow.php | 18 +- .../airavataAPI.thrift | 56 +- .../appcatalog/cpi/ApplicationInterface.java | 2 + .../appcatalog/cpi/ComputeResource.java | 2 + .../data/impl/ApplicationInterfaceImpl.java | 16 + .../catalog/data/impl/ComputeResourceImpl.java | 30 +- .../data/resources/AppModuleResource.java | 28 +- .../data/resources/BatchQueueResource.java | 18 +- .../data/resources/HostAliasResource.java | 12 +- .../data/resources/HostIPAddressResource.java | 11 +- .../data/util/AppCatalogThriftConversion.java | 2 +- .../app/catalog/test/ComputeResourceTest.java | 19 +- 20 files changed, 43672 insertions(+), 26050 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/44c72f4d/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java ----------------------------------------------------------------------
