Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into log_publisher
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/b5e03ff5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b5e03ff5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b5e03ff5 Branch: refs/heads/master Commit: b5e03ff589adae3bbe8361ddb2fb058969111763 Parents: f3f015c 8a7f781 Author: Isuru <[email protected]> Authored: Tue Feb 11 13:10:25 2014 +0530 Committer: Isuru <[email protected]> Committed: Tue Feb 11 13:10:25 2014 +0530 ---------------------------------------------------------------------- .gitignore | 3 + .../stratos/cli/commands/ExitCommand.java | 19 +- .../controller/iaases/OpenstackNovaIaas.java | 19 +- .../cloud/controller/pojo/CartridgeConfig.java | 10 + .../cloud/controller/pojo/CartridgeInfo.java | 10 + .../apache/stratos/manager/dto/Cartridge.java | 16 +- .../manager/lookup/LookupDataHolder.java | 21 + .../manager/lookup/SubscriptionContext.java | 2 + .../manager/CartridgeSubscriptionManager.java | 10 +- .../DataInsertionAndRetrievalManager.java | 15 + .../service/ApplicationManagementService.java | 2 +- .../subscription/CartridgeSubscription.java | 9 + .../utils/CartridgeSubscriptionUtils.java | 4 +- .../definition/CartridgeDefinitionBean.java | 2 + .../bean/util/converter/PojoConverter.java | 3 + .../rest/endpoint/services/ServiceUtils.java | 53 +- .../rest/endpoint/services/StratosAdmin.java | 21 + .../main/resources/CloudControllerService.wsdl | 604 ++++++++++--------- 18 files changed, 498 insertions(+), 325 deletions(-) ----------------------------------------------------------------------
