airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Date Wed, 14 May 2014 16:12:35 GMT
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/d76c9d57
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d76c9d57
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d76c9d57

Branch: refs/heads/master
Commit: d76c9d57fae4574d47624dddeadae28e444b0317
Parents: f05dd0f 7147780
Author: lahiru <lahiru@apache.org>
Authored: Wed May 14 12:12:18 2014 -0400
Committer: lahiru <lahiru@apache.org>
Committed: Wed May 14 12:12:18 2014 -0400

----------------------------------------------------------------------
 .../server/handler/AiravataServerHandler.java   |  19 ++-
 .../java/org/apache/airavata/api/Airavata.java  | 125 ++------------
 .../src/main/resources/lib/Airavata.cpp         |  28 +---
 .../src/main/resources/lib/Airavata.h           |  24 +--
 .../resources/lib/Airavata_server.skeleton.cpp  |   2 +-
 .../resources/lib/experimentModel_types.cpp     |   4 +-
 .../main/resources/lib/experimentModel_types.h  |   7 +-
 .../resources/lib/Airavata/API/Airavata.php     |  29 +---
 .../Model/Workspace/Experiment/Types.php        |  14 +-
 .../client/samples/CreateLaunchExperiment.java  |  10 +-
 .../samples/CreateLaunchExperimentUS3.java      |   8 +-
 .../model/workspace/experiment/DataType.java    |  13 +-
 airavata-api/generate-thrift-files.sh           |  10 +-
 .../airavataAPI.thrift                          |   3 +-
 .../applicationCatalogAPI.thrift                | 165 +++++++++++++++++++
 .../apache/airavata/integration/BaseCaseIT.java |   4 +-
 .../airavata/integration/DataRetrievalIT.java   |   2 +-
 .../airavata/integration/SimpleEchoIT.java      |   2 +-
 18 files changed, 246 insertions(+), 223 deletions(-)
----------------------------------------------------------------------



Mime
View raw message