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/db94c558 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/db94c558 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/db94c558 Branch: refs/heads/master Commit: db94c558d5aaaf5722cd588f9c058f9f6f54e787 Parents: debde7a 343ea0a Author: Shameera Rathanyaka <[email protected]> Authored: Mon Jul 6 11:23:53 2015 -0400 Committer: Shameera Rathanyaka <[email protected]> Committed: Mon Jul 6 11:23:53 2015 -0400 ---------------------------------------------------------------------- .../catalog/model/ExperimentError.java | 6 ++-- .../catalog/model/ExperimentInput.java | 24 ++++++------- .../catalog/model/ExperimentOutput.java | 18 +++++----- .../core/experiment/catalog/model/Process.java | 6 ++-- .../experiment/catalog/model/ProcessError.java | 6 ++-- .../experiment/catalog/model/ProcessInput.java | 24 ++++++------- .../experiment/catalog/model/ProcessOutput.java | 18 +++++----- .../experiment/catalog/model/TaskError.java | 6 ++-- .../catalog/model/UserConfigurationData.java | 30 ++++++++-------- .../resources/ExperimentErrorResource.java | 6 ++-- .../resources/ExperimentInputResource.java | 24 ++++++------- .../resources/ExperimentOutputResource.java | 18 +++++----- .../catalog/resources/ExperimentResource.java | 6 ++-- .../catalog/resources/ProcessErrorResource.java | 6 ++-- .../catalog/resources/ProcessInputResource.java | 24 ++++++------- .../resources/ProcessOutputResource.java | 18 +++++----- .../catalog/resources/ProcessResource.java | 6 ++-- .../catalog/resources/TaskErrorResource.java | 6 ++-- .../UserConfigurationDataResource.java | 30 ++++++++-------- .../utils/ThriftDataModelConversion.java | 38 +++++++++++--------- 20 files changed, 163 insertions(+), 157 deletions(-) ----------------------------------------------------------------------
