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/531cbdfb Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/531cbdfb Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/531cbdfb Branch: refs/heads/develop Commit: 531cbdfbcdc07893f69f0bea8cec9011fdf3a7b7 Parents: bd77541 4dc6588 Author: scnakandala <[email protected]> Authored: Wed Jan 6 11:34:39 2016 -0500 Committer: scnakandala <[email protected]> Committed: Wed Jan 6 11:34:39 2016 -0500 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 232 ++++++++++++++----- .../src/main/resources/expcatalog-mysql.sql | 13 +- 2 files changed, 179 insertions(+), 66 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/531cbdfb/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql ----------------------------------------------------------------------
