Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/d0e944cb Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d0e944cb Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d0e944cb Branch: refs/heads/master Commit: d0e944cbb8404983f9b3a907e6161a31abd5295f Parents: 9f31298 a440e8d Author: Lahiru Sandaruwan <[email protected]> Authored: Fri Jan 10 14:41:18 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Fri Jan 10 14:41:18 2014 +0530 ---------------------------------------------------------------------- .../stratos/manager/deploy/service/Service.java | 19 ++++- .../service/ServiceDeploymentManager.java | 79 ++++++++++++++++---- .../service/multitenant/MultiTenantService.java | 5 -- .../multitenant/lb/MultiTenantLBService.java | 5 -- .../ServiceAlreadyDeployedException.java | 49 ++++++++++++ .../listener/InstanceStatusListener.java | 7 ++ .../InstanceNotificationPublisher.java | 13 +++- .../InstanceCleanupNotificationService.java | 9 ++- .../notifier/InstanceCleanupClusterEvent.java | 38 ++++++++++ .../instance/notifier/InstanceCleanupEvent.java | 47 ------------ .../notifier/InstanceCleanupMemberEvent.java | 38 ++++++++++ ...InstanceCleanupNotifierMessageProcessor.java | 6 +- .../rest/endpoint/services/ServiceUtils.java | 28 ++++++- .../rest/endpoint/services/StratosAdmin.java | 14 +++- .../pom.xml | 1 + service-stubs/pom.xml | 1 + 16 files changed, 273 insertions(+), 86 deletions(-) ----------------------------------------------------------------------
