Merge branch 'pullrequest' into docker
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/a769c05a Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/a769c05a Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/a769c05a Branch: refs/heads/docker Commit: a769c05aa031cb90bc42059a1e42110ec81a83fd Parents: a879419 8d0f8be Author: mbassarw <[email protected]> Authored: Sun Aug 21 17:52:25 2016 +0100 Committer: mbassarw <[email protected]> Committed: Sun Aug 21 17:52:25 2016 +0100 ---------------------------------------------------------------------- .../activities/docker/DockerActivity.java | 18 +++-- .../docker/DockerActivityHealthChecker.java | 49 +++++++++++++ .../activities/docker/ValidationUtil.java | 77 ++++++++++++++++++++ .../spring/docker-activity-context-osgi.xml | 1 + .../META-INF/spring/docker-activity-context.xml | 2 + .../docker/test/DockerActivityTest.java | 12 +-- 6 files changed, 147 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
