airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject [3/3] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Date Fri, 23 May 2014 12:27:36 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/507686a6
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/507686a6
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/507686a6

Branch: refs/heads/master
Commit: 507686a6004428b8dfed4707b60d426713a4593e
Parents: 2c24439 928e37b
Author: samindaw <samindaw@gmail.com>
Authored: Fri May 23 05:27:11 2014 -0700
Committer: samindaw <samindaw@gmail.com>
Committed: Fri May 23 05:27:11 2014 -0700

----------------------------------------------------------------------
 .../airavata/api/server/AiravataAPIServer.java  |  14 +-
 .../api/server/ApplicationCatalogServer.java    | 152 +++++++++++++++++++
 .../handler/ApplicationCatalogHandler.java      | 143 +++++++++++++----
 .../airavata/api/server/util/Constants.java     |   1 +
 .../api/client/AiravataClientFactory.java       |  31 ++++
 .../resources/lib/AiravataClientFactory.php     |  14 ++
 .../main/resources/airavata-client.properties   |   3 +
 .../main/resources/airavata-server.properties   |  10 +-
 .../apache/airavata/integration/BaseCaseIT.java |  10 +-
 9 files changed, 335 insertions(+), 43 deletions(-)
----------------------------------------------------------------------



Mime
View raw message