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/014c1238 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/014c1238 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/014c1238 Branch: refs/heads/master Commit: 014c12384a0ced0ba1c4d33b5e6f8efd4aaf6f9a Parents: 1e79c24 8abc4d3 Author: raminder <[email protected]> Authored: Wed Sep 17 09:29:47 2014 -0400 Committer: raminder <[email protected]> Committed: Wed Sep 17 09:29:47 2014 -0400 ---------------------------------------------------------------------- .../lib/airavata/experimentModel_types.cpp | 22 +- .../lib/airavata/experimentModel_types.h | 23 +- .../Model/Workspace/Experiment/Types.php | 20 + .../client/samples/CreateLaunchExperiment.java | 588 ++++++++++--------- .../tools/RegisterSampleApplications.java | 109 +++- .../experiment/UserConfigurationData.java | 104 +++- .../experimentModel.thrift | 1 + .../data/impl/ApplicationInterfaceImpl.java | 13 +- .../catalog/data/impl/ComputeResourceImpl.java | 4 +- .../data/impl/GwyResourceProfileImpl.java | 8 +- .../src/main/resources/registry-derby.sql | 2 +- 11 files changed, 589 insertions(+), 305 deletions(-) ----------------------------------------------------------------------
