You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/01/21 02:23:33 UTC

[6/6] incubator-brooklyn git commit: This closes #1164

This closes #1164


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/51188609
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/51188609
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/51188609

Branch: refs/heads/master
Commit: 5118860990e98881a522d377f3ceca6a1b5df868
Parents: 8303fea 11a0b8a
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Jan 21 01:22:59 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Jan 21 01:22:59 2016 +0000

----------------------------------------------------------------------
 .../apache/brooklyn/core/entity/Entities.java   | 13 ++--
 .../internal/AbstractManagementContext.java     | 11 ++-
 .../mgmt/internal/BrooklynShutdownHooks.java    |  4 +-
 .../mgmt/internal/LocalManagementContext.java   | 29 +++++---
 .../brooklyn/rest/resources/ServerResource.java |  1 +
 .../brooklyn/rest/BrooklynRestApiLauncher.java  | 32 +++++++--
 .../rest/testing/BrooklynRestApiTest.java       |  8 +--
 .../rest/util/NoOpRecordingShutdownHandler.java | 39 ++++++++++
 .../util/ServerStoppingShutdownHandler.java     | 75 ++++++++++++++++++++
 .../brooklyn/rest/util/TestShutdownHandler.java | 39 ----------
 .../main/java/org/apache/brooklyn/cli/Main.java | 46 ++++++------
 11 files changed, 210 insertions(+), 87 deletions(-)
----------------------------------------------------------------------