conflict resolution
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/4c56c726 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/4c56c726 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/4c56c726 Branch: refs/heads/master Commit: 4c56c7267c114981b594854d1da64301b07001cb Parents: 6c2e4eb f7daf56 Author: Nirmal Fernando <[email protected]> Authored: Tue Feb 11 18:35:55 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Tue Feb 11 18:35:55 2014 +0530 ---------------------------------------------------------------------- .gitignore | 3 + .../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 | 7 +- .../UndeployServiceDefinitionCommand.java | 70 + .../apache/stratos/cli/utils/CliConstants.java | 11 +- .../controller/iaases/OpenstackNovaIaas.java | 2 + .../cloud/controller/pojo/CartridgeConfig.java | 10 + .../cloud/controller/pojo/CartridgeInfo.java | 10 + .../console/cartridge_info.jag | 9 + .../console/config/console.js | 23 +- .../console/config/console.json | 8 +- .../console/configure_stratos.jag | 8 +- .../controllers/cartridgeDefintionSubmit.jag | 2 +- .../console/controllers/login.jag | 2 +- .../console/controllers/loginSubmit.jag | 3 +- .../console/controllers/logout.jag | 5 +- .../console/controllers/router.jag | 19 +- .../console/controllers/wizardSubmit.jag | 6 +- .../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 +- .../partials/configure_stratos_wizard.hbs | 152 +- .../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/configure_stratos.js | 9 +- .../renderers/configure_stratos_wizard.js | 3 +- .../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/themes/theme1/ui/js/wizard.js | 26 +- .../console/util/utility.jag | 11 +- .../manager/client/CartridgeAgentClient.java | 44 - .../stratos/manager/client/RegistryClient.java | 109 -- .../apache/stratos/manager/dns/DNSManager.java | 89 -- .../stratos/manager/domain/RegistryManager.java | 109 -- .../org/apache/stratos/manager/dto/AppRepo.java | 88 -- .../apache/stratos/manager/dto/Cartridge.java | 46 +- .../stratos/manager/dto/CartridgeDetail.java | 22 - .../manager/dto/CartridgeInformation.java | 22 - .../stratos/manager/internal/DataHolder.java | 8 - .../manager/internal/HostingConstants.java | 40 - .../internal/HostingManagementActivator.java | 63 - .../manager/lookup/ClusterIdToSubscription.java | 5 - .../manager/lookup/LookupDataHolder.java | 27 +- .../manager/lookup/SubscriptionContext.java | 2 + .../manager/CartridgeSubscriptionManager.java | 343 +---- .../manager/payload/BasicPayloadData.java | 28 - .../stratos/manager/payload/CarbonPayload.java | 43 - .../stratos/manager/payload/DataPayload.java | 40 - .../manager/payload/NonCarbonPayload.java | 125 -- .../apache/stratos/manager/payload/Payload.java | 224 --- .../stratos/manager/payload/PayloadArg.java | 194 --- .../stratos/manager/payload/PayloadData.java | 16 +- .../DatabaseBasedPersistenceManager.java | 1408 ------------------ .../manager/persistence/PersistenceManager.java | 44 - .../RegistryBasedPersistenceManager.java | 216 --- .../manager/registry/RegistryManager.java | 130 -- .../DataInsertionAndRetrievalManager.java | 124 +- .../service/ApplicationManagementService.java | 2 +- .../subscription/CartridgeSubscription.java | 9 + .../subscription/CartridgeSubscription_old.java | 431 ------ .../DataCartridgeSubscription_old.java | 127 -- .../MultiTenantCartridgeSubscription.java | 134 -- .../SingleTenantCartridgeSubscription.java | 136 -- .../SubscriptionMultiTenantBehaviour.java | 5 +- .../utils/CartridgeSubscriptionUtils.java | 4 +- .../StratosManagerTopologyReceiver.java | 69 +- .../stratos/manager/utils/CartridgeAppType.java | 44 - .../stratos/manager/utils/CartridgeDomain.java | 146 -- .../stratos/manager/utils/DomainInfo.java | 43 - .../definition/CartridgeDefinitionBean.java | 2 + .../bean/util/converter/PojoConverter.java | 3 + .../stratos/rest/endpoint/mock/MockContext.java | 4 + .../rest/endpoint/mock/StratosTestAdmin.java | 9 +- .../rest/endpoint/services/ServiceUtils.java | 73 +- .../rest/endpoint/services/StratosAdmin.java | 31 + .../main/webapp/stratos/WEB-INF/cxf-servlet.xml | 2 +- .../main/resources/CloudControllerService.wsdl | 603 ++++---- 90 files changed, 1297 insertions(+), 5123 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4c56c726/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java index 0c7da61,0ab5932..8e7b1ca --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java @@@ -285,7 -281,7 +285,9 @@@ public class OpenstackNovaIaas extends String region = ComputeServiceBuilderUtil.extractRegion(iaasInfo); ++ @SuppressWarnings("deprecation") RestContext<NovaApi, NovaAsyncApi> nova = context.unwrap(); ++ @SuppressWarnings("deprecation") FloatingIPApi floatingIPApi = nova.getApi() .getFloatingIPExtensionForZone(region).get(); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4c56c726/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl ---------------------------------------------------------------------- diff --cc service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl index 9ee8b4e,d5a613d..3c5e016 --- a/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl +++ b/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl @@@ -230,18 -230,17 +230,32 @@@ </xs:complexType> <xs:complexType name="MemberContext"> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="allocatedIpAddress" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="initTime" type="xs:long"></xs:element> + <xs:element minOccurs="0" name="instanceId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="lbClusterId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="nodeId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="partition" nillable="true" type="ax29:Partition"></xs:element> + <xs:element minOccurs="0" name="privateIpAddress" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="publicIpAddress" nillable="true" type="xs:string"></xs:element> ++======= + <xs:element minOccurs="0" name="allocatedIpAddress" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="initTime" type="xs:long"/> + <xs:element minOccurs="0" name="lbClusterId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="nodeId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="partition" nillable="true" type="ax29:Partition"/> + <xs:element minOccurs="0" name="privateIpAddress" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="publicIpAddress" nillable="true" type="xs:string"/> ++>>>>>>> f7daf5633cd2eb9a1774b6c7f47eb48924f35e64 </xs:sequence> </xs:complexType> <xs:complexType name="Registrant"> @@@ -842,22 -843,22 +858,41 @@@ </wsdl:binding> <wsdl:service name="CloudControllerService"> <wsdl:port name="CloudControllerServiceHttpSoap11Endpoint" binding="ns:CloudControllerServiceSoap11Binding"> ++<<<<<<< HEAD + <soap:address location="http://10.138.175.31:9764/services/CloudControllerService.CloudControllerServiceHttpSoap11Endpoint/";></soap:address> + </wsdl:port> + <wsdl:port name="CloudControllerServiceHttpsSoap11Endpoint" binding="ns:CloudControllerServiceSoap11Binding"> + <soap:address location="https://10.138.175.31:9444/services/CloudControllerService.CloudControllerServiceHttpsSoap11Endpoint/";></soap:address> + </wsdl:port> + <wsdl:port name="CloudControllerServiceHttpSoap12Endpoint" binding="ns:CloudControllerServiceSoap12Binding"> + <soap12:address location="http://10.138.175.31:9764/services/CloudControllerService.CloudControllerServiceHttpSoap12Endpoint/";></soap12:address> + </wsdl:port> + <wsdl:port name="CloudControllerServiceHttpsSoap12Endpoint" binding="ns:CloudControllerServiceSoap12Binding"> + <soap12:address location="https://10.138.175.31:9444/services/CloudControllerService.CloudControllerServiceHttpsSoap12Endpoint/";></soap12:address> + </wsdl:port> + <wsdl:port name="CloudControllerServiceHttpEndpoint" binding="ns:CloudControllerServiceHttpBinding"> + <http:address location="http://10.138.175.31:9764/services/CloudControllerService.CloudControllerServiceHttpEndpoint/";></http:address> + </wsdl:port> + <wsdl:port name="CloudControllerServiceHttpsEndpoint" binding="ns:CloudControllerServiceHttpBinding"> + <http:address location="https://10.138.175.31:9444/services/CloudControllerService.CloudControllerServiceHttpsEndpoint/";></http:address> ++======= + <soap:address location="http://10.100.0.38:9763/services/CloudControllerService.CloudControllerServiceHttpSoap11Endpoint/"/> + </wsdl:port> + <wsdl:port name="CloudControllerServiceHttpsSoap11Endpoint" binding="ns:CloudControllerServiceSoap11Binding"> + <soap:address location="https://10.100.0.38:9443/services/CloudControllerService.CloudControllerServiceHttpsSoap11Endpoint/"/> + </wsdl:port> + <wsdl:port name="CloudControllerServiceHttpSoap12Endpoint" binding="ns:CloudControllerServiceSoap12Binding"> + <soap12:address location="http://10.100.0.38:9763/services/CloudControllerService.CloudControllerServiceHttpSoap12Endpoint/"/> + </wsdl:port> + <wsdl:port name="CloudControllerServiceHttpsSoap12Endpoint" binding="ns:CloudControllerServiceSoap12Binding"> + <soap12:address location="https://10.100.0.38:9443/services/CloudControllerService.CloudControllerServiceHttpsSoap12Endpoint/"/> + </wsdl:port> + <wsdl:port name="CloudControllerServiceHttpEndpoint" binding="ns:CloudControllerServiceHttpBinding"> + <http:address location="http://10.100.0.38:9763/services/CloudControllerService.CloudControllerServiceHttpEndpoint/"/> + </wsdl:port> + <wsdl:port name="CloudControllerServiceHttpsEndpoint" binding="ns:CloudControllerServiceHttpBinding"> + <http:address location="https://10.100.0.38:9443/services/CloudControllerService.CloudControllerServiceHttpsEndpoint/"/> ++>>>>>>> f7daf5633cd2eb9a1774b6c7f47eb48924f35e64 </wsdl:port> </wsdl:service> </wsdl:definitions>
