Resolving conflict in ServiceUtils.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/c5939faf Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/c5939faf Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/c5939faf Branch: refs/heads/master Commit: c5939faf54ff1b5784c5f802e1146dd273387542 Parents: 0de4271 469b8c6 Author: Sajith Kariyawasam <[email protected]> Authored: Wed Feb 12 00:38:36 2014 +0530 Committer: Sajith Kariyawasam <[email protected]> Committed: Wed Feb 12 00:38:36 2014 +0530 ---------------------------------------------------------------------- .gitignore | 3 + .../autoscaler/NetworkPartitionLbHolder.java | 41 +- .../topology/AutoscalerTopologyReceiver.java | 31 ++ .../autoscaler/partition/PartitionManager.java | 14 + .../java/org/apache/stratos/cli/CliTool.java | 2 +- .../stratos/cli/CommandLineApplication.java | 32 +- .../stratos/cli/RestCommandLineService.java | 95 ++++- .../apache/stratos/cli/StratosApplication.java | 24 +- .../stratos/cli/beans/cartridge/Cartridge.java | 9 + .../DeployServiceDeploymentCommand.java | 139 +++++++ .../DescribeAutoScalingPolicyCommand.java | 2 +- .../stratos/cli/commands/ExitCommand.java | 12 - .../UndeployServiceDefinitionCommand.java | 70 ++++ .../apache/stratos/cli/utils/CliConstants.java | 11 +- .../org.apache.stratos.cloud.controller/pom.xml | 3 - .../axiom/parser/CartridgeConfigParser.java | 384 ------------------- .../parser/CloudControllerConfigParser.java | 2 +- .../cloud/controller/iaases/AWSEC2Iaas.java | 114 ++++++ .../controller/iaases/OpenstackNovaIaas.java | 115 +++++- .../cloud/controller/iaases/VCloudIaas.java | 24 ++ .../impl/CloudControllerServiceImpl.java | 104 ++++- .../cloud/controller/interfaces/Iaas.java | 29 ++ .../jcloud/ComputeServiceBuilderUtil.java | 5 + .../cloud/controller/pojo/ClusterContext.java | 53 ++- .../cloud/controller/pojo/IaasProvider.java | 9 + .../cloud/controller/pojo/MemberContext.java | 10 + .../runtime/FasterLookUpDataHolder.java | 223 ++--------- .../controller/topology/TopologyBuilder.java | 6 +- .../topology/TopologyEventPublisher.java | 4 +- .../controller/util/CloudControllerUtil.java | 46 ++- .../OpenstackNovaPartitionValidator.java | 2 +- .../axiom/FasterLookupDataHolderTest.java | 92 +++++ .../console/cartridge_info.jag | 9 + .../controllers/cartridgeDefintionSubmit.jag | 2 +- .../console/controllers/loginSubmit.jag | 3 +- .../console/index.jag | 1 - .../console/modules/pinch.min.js | 4 + .../console/subscribe_cartridge.jag | 6 +- .../themes/theme1/partials/cartridge_info.hbs | 37 ++ .../themes/theme1/partials/cartridges.hbs | 18 +- .../console/themes/theme1/partials/header.hbs | 2 +- .../themes/theme1/partials/mycartridges.hbs | 18 +- .../theme1/partials/subscribe_cartridge.hbs | 53 ++- .../themes/theme1/partials/tenant_new.hbs | 4 +- .../themes/theme1/renderers/cartridge_info.js | 42 ++ .../theme1/renderers/subscribe_cartridge.js | 8 +- .../console/themes/theme1/theme.js | 7 + .../console/themes/theme1/ui/css/main.css | 7 +- .../themes/theme1/ui/custom-fonts/style.css | 25 +- .../console/util/utility.jag | 7 + .../apache/stratos/manager/dto/Cartridge.java | 30 ++ .../manager/lookup/LookupDataHolder.java | 21 + .../manager/lookup/SubscriptionContext.java | 2 + .../DataInsertionAndRetrievalManager.java | 15 + .../utils/CartridgeSubscriptionUtils.java | 4 +- .../messaging/domain/topology/Service.java | 4 +- .../event/topology/ClusterRemovedEvent.java | 8 +- .../stratos/messaging/util/Constants.java | 11 +- .../stratos/rest/endpoint/mock/MockContext.java | 4 + .../rest/endpoint/mock/StratosTestAdmin.java | 9 +- .../rest/endpoint/services/ServiceUtils.java | 21 +- .../rest/endpoint/services/StratosAdmin.java | 10 + .../main/webapp/stratos/WEB-INF/cxf-servlet.xml | 2 +- .../main/resources/CloudControllerService.wsdl | 3 +- 64 files changed, 1397 insertions(+), 710 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c5939faf/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java ----------------------------------------------------------------------
