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/e53dd346 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e53dd346 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e53dd346 Branch: refs/heads/master Commit: e53dd346b13c86c07448d5fd108e3924c10da5b8 Parents: 6ed8348 a33dd2a Author: Saminda Wijeratne <[email protected]> Authored: Tue Jul 8 14:21:25 2014 -0400 Committer: Saminda Wijeratne <[email protected]> Committed: Tue Jul 8 14:21:25 2014 -0400 ---------------------------------------------------------------------- .../main/resources/conf/airavata-client-properties.ini | 6 +++--- .../airavata/client/samples/CreateLaunchExperiment.java | 2 +- .../src/test/resources/registry-derby.sql | 11 +++++++---- .../src/test/resources/registry-derby.sql | 11 +++++++---- .../src/test/resources/registry-derby.sql | 11 +++++++---- .../persistance/registry/jpa/model/Experiment_Input.java | 7 ++++--- .../registry/jpa/model/Experiment_Output.java | 7 ++++--- .../registry/jpa/resources/ExperimentInputResource.java | 8 ++++++-- .../registry/jpa/resources/ExperimentOutputResource.java | 8 ++++++-- .../persistance/registry/jpa/resources/Utils.java | 4 ++-- .../src/main/resources/registry-derby.sql | 4 ++-- .../src/main/resources/registry-mysql.sql | 4 ++-- .../src/test/resources/registry-derby.sql | 11 +++++++---- 13 files changed, 58 insertions(+), 36 deletions(-) ----------------------------------------------------------------------
