You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2014/03/03 18:08:57 UTC
[2/2] git commit: fixing merge
fixing merge
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/22cd1a09
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/22cd1a09
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/22cd1a09
Branch: refs/heads/master
Commit: 22cd1a0917e7e4b08d6eb09a777462d14fe48ddf
Parents: 3f8457a 0a470ce
Author: lahiru <la...@apache.org>
Authored: Mon Mar 3 12:08:40 2014 -0500
Committer: lahiru <la...@apache.org>
Committed: Mon Mar 3 12:08:40 2014 -0500
----------------------------------------------------------------------
.../model/workspace/experiment/JobState.java | 36 +-
.../workspace/experiment/TransferState.java | 43 +-
.../model/util/ExperimentModelUtil.java | 4 +-
.../computeResourceDescription.thrift | 166 ++
.../experimentModel.thrift | 9 +-
modules/airavata-client/pom.xml | 5 -
.../registry/jpa/impl/ExperimentRegistry.java | 1556 ++++++++++--------
.../registry/jpa/impl/RegistryFactory.java | 2 +-
.../registry/jpa/impl/RegistryImpl.java | 752 +++++----
.../jpa/ExperimentInputResourceTest.java | 136 +-
.../jpa/ExperimentOutputResourceTest.java | 76 +
.../apache/airavata/registry/cpi/Registry.java | 20 +-
.../registry/cpi/RegistryException.java | 38 +
13 files changed, 1732 insertions(+), 1111 deletions(-)
----------------------------------------------------------------------