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/27626707 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/27626707 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/27626707 Branch: refs/heads/develop Commit: 276267074933bfe0752f35183a191eb22f2f35d9 Parents: ebf67da 4286bf7 Author: Chathuri Wimalasena <[email protected]> Authored: Mon Jan 4 14:48:59 2016 -0500 Committer: Chathuri Wimalasena <[email protected]> Committed: Mon Jan 4 14:48:59 2016 -0500 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 20 +++--- .../api/server/util/RegistryInitUtil.java | 2 +- .../manager/core/MetadataCatalogService.java | 76 ++++++++++++++++++++ .../experiment/catalog/ExpCatResourceUtils.java | 9 +-- .../catalog/impl/ExperimentCatalogImpl.java | 4 +- .../catalog/impl/ExperimentRegistry.java | 2 +- .../catalog/impl/ProjectRegistry.java | 2 +- .../catalog/resources/WorkerResource.java | 2 +- .../src/main/resources/expcatalog-mysql.sql | 3 +- 9 files changed, 99 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/27626707/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/27626707/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql ----------------------------------------------------------------------
