Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6c483bc4 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6c483bc4 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6c483bc4 Branch: refs/heads/develop Commit: 6c483bc4cf9f7a7c7301449a02dd50e499baccd5 Parents: f30e73f 199c301 Author: Shameera Rathnayaka <[email protected]> Authored: Wed Mar 23 18:05:55 2016 -0400 Committer: Shameera Rathnayaka <[email protected]> Committed: Wed Mar 23 18:05:55 2016 -0400 ---------------------------------------------------------------------- .../client/samples/DataCatalogSample.java | 2 +- .../test/resources/airavata-server.properties | 13 ---- .../server/OrchestratorServerHandler.java | 37 +++++++---- .../core/data/catalog/impl/DataCatalogImpl.java | 64 +++++++++++++++++++- .../airavata/data/catalog/DataCatalogTest.java | 6 +- .../airavata/registry/cpi/DataCatalog.java | 12 ++-- 6 files changed, 96 insertions(+), 38 deletions(-) ----------------------------------------------------------------------
