Merge branch '4.0.0-grouping' of 
https://git-wip-us.apache.org/repos/asf/stratos into 4.0.0-grouping


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/9677d15a
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9677d15a
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9677d15a

Branch: refs/heads/4.0.0-grouping
Commit: 9677d15aad8fe423a74d6c19c8abe5e44f547328
Parents: 6877dca de369d9
Author: Udara Liyanage <[email protected]>
Authored: Tue Sep 23 17:57:43 2014 +0530
Committer: Udara Liyanage <[email protected]>
Committed: Tue Sep 23 17:57:43 2014 +0530

----------------------------------------------------------------------
 .../org.apache.stratos.cloud.controller/pom.xml |   1 -
 .../application/ApplicationUtils.java           |  38 +-
 .../parser/DefaultApplicationParser.java        | 114 +++-
 .../impl/CloudControllerServiceImpl.java        |   4 +-
 .../interfaces/CloudControllerService.java      |   2 +-
 .../pojo/payload/PayloadDataHolder.java         |  21 +-
 .../controller/topology/TopologyBuilder.java    |   7 +-
 .../topology/TopologyEventPublisher.java        |  10 +-
 .../client/CloudControllerServiceClient.java    |   4 +-
 .../CompositeApplicationManager.java            |   2 +-
 .../manager/CartridgeSubscriptionManager.java   |  68 ++-
 .../DataInsertionAndRetrievalManager.java       |   6 +-
 .../StratosManagerTopologyEventReceiver.java    |  44 +-
 .../event/topology/ApplicationRemovedEvent.java |  20 +-
 .../ApplicationRemovedMessageProcessor.java     |  70 ++-
 .../rest/endpoint/services/ServiceUtils.java    |  21 +-
 .../main/resources/CloudControllerService.wsdl  | 546 ++++++++++---------
 17 files changed, 645 insertions(+), 333 deletions(-)
----------------------------------------------------------------------


Reply via email to