Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/cf945f01 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/cf945f01 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/cf945f01 Branch: refs/heads/master Commit: cf945f01ad0f34d02f7a3fc654826aae540761ed Parents: 76fb56d 9c5d4bf Author: Suresh Marru <[email protected]> Authored: Tue Jul 8 12:00:04 2014 -0400 Committer: Suresh Marru <[email protected]> Committed: Tue Jul 8 12:00:04 2014 -0400 ---------------------------------------------------------------------- .../airavata/api/server/AiravataAPIServer.java | 6 +- .../server/handler/AiravataServerHandler.java | 7 +- .../java/org/apache/airavata/api/Airavata.java | 82 +++++---- .../src/main/resources/lib/Airavata.cpp | 24 +-- .../src/main/resources/lib/Airavata.h | 26 +-- .../resources/lib/Airavata_server.skeleton.cpp | 2 +- .../lib/applicationDeploymentModel_types.cpp | 58 +++--- .../lib/applicationDeploymentModel_types.h | 13 +- .../lib/applicationInterfaceModel_types.cpp | 88 +++------- .../lib/applicationInterfaceModel_types.h | 26 +-- .../lib/computeResourceModel_types.cpp | 54 ++---- .../resources/lib/computeResourceModel_types.h | 13 +- .../resources/lib/Airavata/API/Airavata.php | 10 +- .../Model/AppCatalog/AppDeployment/Types.php | 76 +++----- .../Model/AppCatalog/AppInterface/Types.php | 110 ++++-------- .../Model/AppCatalog/ComputeResource/Types.php | 70 +++----- .../ApplicationDeploymentDescription.java | 176 +++++-------------- .../ApplicationInterfaceDescription.java | 144 +++------------ .../appinterface/InputDataObjectType.java | 150 +++------------- .../ComputeResourceDescription.java | 168 ++++-------------- .../airavataAPI.thrift | 2 +- .../applicationDeploymentModel.thrift | 22 +-- .../applicationInterfaceModel.thrift | 30 ++-- .../computeResourceModel.thrift | 20 +-- .../client/tools/DocumentCreatorNew.java | 56 +++--- .../client/tools/DocumentCreatorUtils.java | 4 +- .../data/impl/GwyResourceProfileImpl.java | 3 +- .../main/resources/airavata-server.properties | 4 +- .../registry/jpa/model/ApplicationInput.java | 6 +- .../registry/jpa/model/ApplicationOutput.java | 6 +- .../jpa/resources/ApplicationInputResource.java | 9 +- .../resources/ApplicationOutputResource.java | 8 +- .../registry/jpa/resources/Utils.java | 4 +- 33 files changed, 467 insertions(+), 1010 deletions(-) ----------------------------------------------------------------------
