merge
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d2f964b8 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d2f964b8 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d2f964b8 Branch: refs/heads/master Commit: d2f964b8d4ef93acac617d1531a4d63cc1fd1869 Parents: 7cd9457 4260622 Author: scnakandala <[email protected]> Authored: Fri Jul 8 18:54:09 2016 -0400 Committer: scnakandala <[email protected]> Committed: Fri Jul 8 18:54:09 2016 -0400 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 29 ++-------- .../catalog/impl/ExperimentCatalogImpl.java | 45 ---------------- .../catalog/impl/ExperimentRegistry.java | 56 +------------------- .../catalog/impl/ProjectRegistry.java | 47 ---------------- .../catalog/resources/WorkerResource.java | 10 +--- .../registry/cpi/ExperimentCatalog.java | 16 ------ 6 files changed, 8 insertions(+), 195 deletions(-) ----------------------------------------------------------------------
