resolving wsdl conflict
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6d6e3ce1 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6d6e3ce1 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6d6e3ce1 Branch: refs/heads/master Commit: 6d6e3ce1dea89ee19b724fd256ebd73bd46aa693 Parents: b6e8ef5 0bc0777 Author: Vishanth <[email protected]> Authored: Thu May 14 15:41:25 2015 +0530 Committer: Vishanth <[email protected]> Committed: Thu May 14 15:41:25 2015 +0530 ---------------------------------------------------------------------- .../dependency/DependencyBuilder.java | 6 +- .../applications/dependency/DependencyTree.java | 13 +- .../ClusterStatusTerminatedProcessor.java | 3 +- .../stratos/cli/RestCommandLineService.java | 3 +- .../openstack/networking/NovaNetworkingApi.java | 10 +- .../common/beans/cartridge/CartridgeBean.java | 10 - .../beans/cartridge/CartridgeReferenceBean.java | 3 + ...tionPolicyNetworkPartitionReferenceBean.java | 45 - .../ChildLevelNetworkPartitionBean.java | 54 - .../partition/ChildLevelPartitionBean.java | 44 - .../beans/partition/NetworkPartitionBean.java | 9 - .../NetworkPartitionReferenceBean.java | 75 ++ .../common/beans/partition/PartitionBean.java | 31 - .../beans/partition/PartitionReferenceBean.java | 66 + .../policy/autoscale/AutoscalePolicyBean.java | 9 - .../policy/deployment/ChildPolicyBean.java | 47 - .../policy/deployment/DeploymentPolicyBean.java | 8 +- .../console/controllers/login/validator.jag | 20 + .../console/errorhtml/error-404.html | 21 + .../console/errorhtml/error.html | 21 + .../css/bootstrap-3.2.0/bootstrap.min.css | 26 +- .../fonts/glyphicons-halflings-regular.svg | 18 + .../console/themes/theme0/css/custom.css | 21 + .../theme0/css/custom/application_editor.css | 20 + .../css/custom/application_group_editor.css | 21 +- .../theme0/css/custom/applications_deploy.css | 20 + .../console/themes/theme0/css/custom/style.css | 21 + .../themes/theme0/css/custom/topology.css | 21 + .../css/font-awesome-4.2.0/font-awesome.min.css | 25 +- .../fonts/fontawesome-webfont.svg | 18 + .../theme0/css/font-mfizz-1.2/font-mfizz.css | 30 +- .../theme0/css/font-mfizz-1.2/font-mfizz.svg | 18 + .../jquery.contextMenu/jquery.contextMenu.css | 25 +- .../themes/theme0/css/web-fonts/open_sans.css | 21 + .../console/themes/theme0/css/wizard/custom.css | 21 + .../themes/theme0/helpers/applications.js | 22 +- .../theme0/helpers/applications_deploy.js | 21 + .../theme0/helpers/applications_editor.js | 21 + .../themes/theme0/helpers/applications_form.js | 21 + .../theme0/helpers/applications_group_editor.js | 21 + .../theme0/helpers/applications_topology.js | 21 + .../themes/theme0/helpers/applications_view.js | 21 + .../themes/theme0/helpers/configure_form.js | 21 + .../console/themes/theme0/helpers/login_body.js | 21 + .../console/themes/theme0/helpers/users_form.js | 21 + .../console/themes/theme0/helpers/wizard.js | 21 + .../js/JSONEditor-0.7.12/jsoneditor-0.7.12.js | 26 +- .../theme0/js/bootstrap-3.2.0/bootstrap.min.js | 24 +- .../console/themes/theme0/js/canvg/canvg.js | 22 +- .../console/themes/theme0/js/canvg/rgbcolor.js | 24 +- .../console/themes/theme0/js/custom.js | 21 + .../theme0/js/custom/applications-deploy.js | 21 + .../theme0/js/custom/applications-editor.js | 21 + .../theme0/js/custom/applications-view.js | 20 + .../js/custom/applications_group_editor.js | 21 + .../theme0/js/custom/applications_topology.js | 21 + .../console/themes/theme0/js/custom/form.js | 21 + .../console/themes/theme0/js/custom/script.js | 21 + .../themes/theme0/js/d3js-v3/d3.v3.min.js | 21 + .../themes/theme0/js/dagre-v0.7.0/dagre.min.js | 21 + .../js/jquery-1.11.1/jquery-1.11.1.min.js | 22 +- .../js/jquery.contextMenu/jquery.contextMenu.js | 23 +- .../js/jquery.contextMenu/jquery.ui.position.js | 25 +- .../js/jsplumb-1.7.2/dom.jsPlumb-1.7.2-min.js | 21 + .../console/themes/theme0/js/login/login.js | 21 + .../themes/theme0/js/noty-2.2.9/noty-2.2.9.js | 27 +- .../console/themes/theme0/js/wizard/custom.js | 30 +- .../console/themes/theme0/pages/index.hbs | 20 + .../themes/theme0/partials/applications.hbs | 21 + .../theme0/partials/applications_deploy.hbs | 21 + .../theme0/partials/applications_editor.hbs | 21 + .../theme0/partials/applications_form.hbs | 21 + .../partials/applications_group_editor.hbs | 21 + .../theme0/partials/applications_topology.hbs | 21 + .../theme0/partials/applications_view.hbs | 21 + .../themes/theme0/partials/configure_form.hbs | 21 + .../themes/theme0/partials/error_page.hbs | 21 + .../themes/theme0/partials/index_header.hbs | 21 + .../themes/theme0/partials/index_left_menu.hbs | 21 + .../theme0/partials/index_right_menu_help.hbs | 21 + .../theme0/partials/index_right_menu_log.hbs | 21 + .../themes/theme0/partials/index_sub_header.hbs | 21 + .../themes/theme0/partials/login_body.hbs | 21 + .../themes/theme0/partials/login_header.hbs | 21 + .../themes/theme0/partials/metro_menu.hbs | 21 + .../themes/theme0/partials/users_form.hbs | 21 + .../console/themes/theme0/partials/wizard.hbs | 21 + .../stratos-resources/css/bootstrap-theme.css | 21 + .../rest/endpoint/api/StratosApiV41Utils.java | 6 +- .../stratos/rest/endpoint/mock/MockContext.java | 146 +-- .../util/converter/ObjectConverter.java | 116 +- ...equestHandlingCapabilityWindowProcessor.java | 21 +- .../conf/templates/jndi.properties.template | 16 + .../scripts/common/add-domain-mappings.sh | 21 + .../scripts/common/add-network-partition.sh | 21 + .../scripts/common/deploy.sh | 21 + .../scripts/common/get-application-runtime.sh | 21 + .../scripts/common/list-domain-mappings.sh | 21 + .../scripts/common/list-network-partition.sh | 21 + .../scripts/common/undeploy.sh | 21 + .../scripts/common/update-deployment-policy.sh | 22 + .../scripts/mock/deploy.sh | 21 + .../scripts/mock/undeploy.sh | 21 + .../scripts/common/deploy.sh | 21 + .../scripts/common/undeploy.sh | 19 + .../tomcat-single-signon/scripts/ec2/deploy.sh | 22 +- .../scripts/ec2/undeploy.sh | 19 + .../scripts/kubernetes/deploy.sh | 22 + .../scripts/kubernetes/undeploy.sh | 19 + .../tomcat-single-signon/scripts/mock/deploy.sh | 21 + .../scripts/mock/undeploy.sh | 19 + .../scripts/openstack/deploy.sh | 21 + .../scripts/openstack/undeploy.sh | 19 + .../wordpress-app/scripts/common/deploy.sh | 22 + .../wordpress-app/scripts/common/undeploy.sh | 19 + .../complex/wordpress-app/scripts/ec2/deploy.sh | 21 + .../wordpress-app/scripts/ec2/undeploy.sh | 19 + .../wordpress-app/scripts/kubernetes/deploy.sh | 22 + .../scripts/kubernetes/undeploy.sh | 19 + .../wordpress-app/scripts/mock/deploy.sh | 21 + .../wordpress-app/scripts/mock/undeploy.sh | 20 + .../wordpress-app/scripts/openstack/deploy.sh | 22 + .../wordpress-app/scripts/openstack/undeploy.sh | 20 + .../scripts/common/deploy.sh | 20 + .../scripts/common/undeploy.sh | 19 + .../complex-app-with-lb/scripts/ec2/deploy.sh | 20 + .../complex-app-with-lb/scripts/ec2/undeploy.sh | 20 + .../scripts/kubernetes/deploy.sh | 20 + .../scripts/kubernetes/undeploy.sh | 20 + .../complex-app-with-lb/scripts/mock/deploy.sh | 19 + .../scripts/mock/undeploy.sh | 20 + .../scripts/openstack/deploy.sh | 20 + .../scripts/openstack/undeploy.sh | 20 + .../scripts/common/deploy.sh | 20 + .../scripts/common/undeploy.sh | 20 + .../scripts/ec2/deploy.sh | 20 + .../scripts/ec2/undeploy.sh | 20 + .../scripts/kubernetes/deploy.sh | 20 + .../scripts/kubernetes/undeploy.sh | 20 + .../scripts/mock/deploy.sh | 20 + .../scripts/mock/undeploy.sh | 20 + .../scripts/openstack/deploy.sh | 20 + .../scripts/openstack/undeploy.sh | 20 + .../scripts/common/deploy.sh | 22 + .../scripts/common/undeploy.sh | 21 + .../scripts/ec2/deploy.sh | 21 + .../scripts/ec2/undeploy.sh | 22 + .../scripts/kubernetes/deploy.sh | 21 + .../scripts/kubernetes/undeploy.sh | 21 + .../scripts/mock/deploy.sh | 22 + .../scripts/mock/undeploy.sh | 24 + .../scripts/openstack/deploy.sh | 22 + .../scripts/openstack/undeploy.sh | 24 + .../scripts/common/deploy.sh | 22 +- .../scripts/common/undeploy.sh | 22 +- .../scripts/common/update-deployment-policy.sh | 22 +- .../scripts/common/update-network-partition.sh | 22 +- .../scripts/ec2/deploy.sh | 22 +- .../scripts/ec2/undeploy.sh | 22 +- .../scripts/kubernetes/deploy.sh | 22 +- .../scripts/kubernetes/undeploy.sh | 22 +- .../scripts/mock/deploy.sh | 22 +- .../scripts/mock/undeploy.sh | 22 +- .../scripts/mock/update-network-partition.sh | 21 + .../scripts/openstack/deploy.sh | 22 +- .../scripts/openstack/undeploy.sh | 22 +- .../openstack/update-network-partition.sh | 21 + .../scripts/common/deploy.sh | 22 +- .../scripts/common/undeploy.sh | 22 +- .../scripts/ec2/deploy.sh | 22 +- .../scripts/ec2/undeploy.sh | 22 +- .../scripts/kubernetes/deploy.sh | 22 +- .../scripts/kubernetes/undeploy.sh | 22 +- .../scripts/mock/deploy.sh | 22 +- .../scripts/mock/undeploy.sh | 22 +- .../scripts/openstack/deploy.sh | 22 +- .../scripts/openstack/undeploy.sh | 22 +- .../scripts/common/deploy.sh | 22 +- .../scripts/common/undeploy.sh | 22 +- .../app-bursting-pattern/scripts/ec2/deploy.sh | 22 +- .../scripts/ec2/undeploy.sh | 22 +- .../scripts/kubernetes/deploy.sh | 22 +- .../scripts/kubernetes/undeploy.sh | 22 +- .../app-bursting-pattern/scripts/mock/deploy.sh | 22 +- .../scripts/mock/undeploy.sh | 22 +- .../scripts/openstack/deploy.sh | 22 +- .../scripts/openstack/undeploy.sh | 22 +- .../sample-cartridges/scripts/common/deploy.sh | 22 +- .../scripts/common/undeploy.sh | 22 +- .../sample-cartridges/scripts/ec2/deploy.sh | 22 +- .../sample-cartridges/scripts/ec2/undeploy.sh | 22 +- .../scripts/kubernetes/deploy.sh | 22 +- .../scripts/kubernetes/undeploy.sh | 22 +- .../sample-cartridges/scripts/mock/deploy.sh | 22 +- .../sample-cartridges/scripts/mock/undeploy.sh | 22 +- .../scripts/openstack/deploy.sh | 22 +- .../scripts/openstack/undeploy.sh | 22 +- .../sample-groups/scripts/common/deploy.sh | 22 +- .../sample-groups/scripts/common/undeploy.sh | 22 +- .../sample-groups/scripts/ec2/deploy.sh | 22 +- .../sample-groups/scripts/ec2/undeploy.sh | 22 +- .../sample-groups/scripts/kubernetes/deploy.sh | 22 +- .../scripts/kubernetes/undeploy.sh | 22 +- .../sample-groups/scripts/mock/deploy.sh | 22 +- .../sample-groups/scripts/mock/undeploy.sh | 22 +- .../sample-groups/scripts/openstack/deploy.sh | 22 +- .../sample-groups/scripts/openstack/undeploy.sh | 22 +- .../group-scaling-app/scripts/common/deploy.sh | 22 +- .../scripts/common/undeploy.sh | 22 +- .../group-scaling-app/scripts/ec2/deploy.sh | 22 +- .../group-scaling-app/scripts/ec2/undeploy.sh | 22 +- .../scripts/kubernetes/deploy.sh | 22 +- .../scripts/kubernetes/undeploy.sh | 22 +- .../group-scaling-app/scripts/mock/deploy.sh | 22 +- .../group-scaling-app/scripts/mock/undeploy.sh | 22 +- .../scripts/openstack/deploy.sh | 22 +- .../scripts/openstack/undeploy.sh | 22 +- .../group-scaling-v1/scripts/common/deploy.sh | 22 +- .../group-scaling-v1/scripts/common/undeploy.sh | 22 +- .../group-scaling-v1/scripts/ec2/deploy.sh | 22 +- .../group-scaling-v1/scripts/ec2/undeploy.sh | 22 +- .../scripts/kubernetes/deploy.sh | 22 +- .../scripts/kubernetes/undeploy.sh | 22 +- .../group-scaling-v1/scripts/mock/deploy.sh | 22 +- .../group-scaling-v1/scripts/mock/undeploy.sh | 22 +- .../scripts/openstack/deploy.sh | 22 +- .../scripts/openstack/undeploy.sh | 22 +- .../scripts/common/deploy.sh | 22 +- .../scripts/common/undeploy.sh | 22 +- .../scripts/ec2/deploy.sh | 22 +- .../scripts/ec2/undeploy.sh | 22 +- .../scripts/kubernetes/deploy.sh | 22 +- .../scripts/kubernetes/undeploy.sh | 22 +- .../scripts/mock/deploy.sh | 22 +- .../scripts/mock/undeploy.sh | 22 +- .../scripts/openstack/deploy.sh | 22 +- .../scripts/openstack/undeploy.sh | 22 +- .../scripts/common/add-domain-mappings.sh | 22 +- .../scripts/common/add-network-partition.sh | 22 +- .../scripts/common/deploy.sh | 22 +- .../scripts/common/get-application-runtime.sh | 22 +- .../scripts/common/list-domain-mappings.sh | 22 +- .../scripts/common/list-network-partition.sh | 22 +- .../scripts/common/undeploy.sh | 22 +- .../scripts/common/update-deployment-policy.sh | 22 +- .../scripts/common/update-network-partition.sh | 22 +- .../single-cartridge-app/scripts/ec2/deploy.sh | 22 +- .../scripts/ec2/undeploy.sh | 22 +- .../scripts/kubernetes/deploy.sh | 22 +- .../scripts/kubernetes/undeploy.sh | 22 +- .../single-cartridge-app/scripts/mock/deploy.sh | 22 +- .../scripts/mock/undeploy.sh | 22 +- .../scripts/openstack/deploy.sh | 22 +- .../scripts/openstack/undeploy.sh | 22 +- .../single-group-app/scripts/common/deploy.sh | 22 +- .../single-group-app/scripts/common/undeploy.sh | 22 +- .../single-group-app/scripts/ec2/deploy.sh | 22 +- .../single-group-app/scripts/ec2/undeploy.sh | 22 +- .../scripts/kubernetes/deploy.sh | 22 +- .../scripts/kubernetes/undeploy.sh | 22 +- .../single-group-app/scripts/mock/deploy.sh | 22 +- .../single-group-app/scripts/mock/undeploy.sh | 22 +- .../scripts/openstack/deploy.sh | 22 +- .../scripts/openstack/undeploy.sh | 22 +- samples/cartridges/mock/postgres | 47 - .../src/main/resources/AutoscalerService.wsdl | 355 +++++- .../main/resources/CloudControllerService.wsdl | 1134 +++++++++--------- .../main/resources/StratosManagerService.wsdl | 19 + .../deployment_script.sh | 20 + .../service-images/php/files/000-default.conf | 17 + .../plugins/PhpServerStarterPlugin.yapsy-plugin | 17 + .../tomcat-saml-sso/files/create-admin-user.sh | 19 + .../service-images/tomcat-saml-sso/files/env | 17 + .../TomcatServerStarterPlugin.yapsy-plugin | 17 + .../TomcatWSO2ISMetadataPublisher.yapsy-plugin | 16 + .../tomcat/files/create-admin-user.sh | 18 + .../service-images/tomcat/files/env | 17 + .../TomcatServerStarterPlugin.yapsy-plugin | 16 + .../service-images/wso2is-saml-sso/files/env | 17 + .../plugins/WSO2ISMetaDataHandler.yapsy-plugin | 17 + .../stratos-docker-images/bind/zone_template | 21 + .../stratos-docker-images/mysql/my.cnf | 21 + .../stratos-docker-images/run-nsenter.sh | 20 + .../conf/templates/jndi.properties.template.erb | 22 + tools/puppet3/modules/appserver/Modulefile | 21 + .../modules/appserver/lib/facter/java_home.rb | 17 + .../conf/datasources/master-datasources.xml.erb | 16 + .../datasources/master-datasources/_remote.erb | 18 +- .../templates/conf/registry/_remote.erb | 16 + .../templates/conf/user-mgt/_roldap.erb | 16 + .../templates/conf/user-mgt/_rwldap.erb | 16 + .../modules/jboss/templates/hornetq/run.erb | 21 + .../conf/templates/jndi.properties.template.erb | 22 + .../templates/mysql_root_password_setter.sh.erb | 17 + .../mysql/templates/publish-metadata.py.erb | 17 + .../plugins/PhpServerStarterPlugin.yapsy-plugin | 17 + .../python_agent/templates/logging.ini.erb | 17 + 297 files changed, 6759 insertions(+), 1270 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/6d6e3ce1/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/6d6e3ce1/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoscalerService.wsdl ---------------------------------------------------------------------- diff --cc service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoscalerService.wsdl index 4bb8d87,d5f5531..a177b51 --- a/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoscalerService.wsdl +++ b/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoscalerService.wsdl @@@ -1,6 -1,6 +1,12 @@@ ++<<<<<<< HEAD +<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; xmlns:ns="http://impl.services.autoscaler.stratos.apache.org"; xmlns:ax28="http://application.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax25="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ax217="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax21="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:ax22="http://common.stratos.apache.org/xsd"; xmlns:ax219="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax214="http://io.java/xsd"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:ax221="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax213="http://rmi.java/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:ax210="http://partition.common.stratos.apache.org/xsd"; xmlns:ax223="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:http="http ://schemas.xmlsoap.org/wsdl/http/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"; xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"; targetNamespace="http://impl.services.autoscaler.stratos.apache.org";> + <wsdl:types> + <xs:schema xmlns:ax215="http://io.java/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://rmi.java/xsd";> ++======= + <?xml version="1.0" encoding="UTF-8"?><wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; xmlns:ax27="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ns="http://impl.services.autoscaler.stratos.apache.org"; xmlns:ax28="http://partition.common.stratos.apache.org/xsd"; xmlns:ax25="http://application.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax21="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:ax22="http://common.stratos.apache.org/xsd"; xmlns:ax216="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax218="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:ax221="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax212="http://rmi.java/xsd"; xmlns:ax213="http://io.java/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:ax223="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:http="http: //schemas.xmlsoap.org/wsdl/http/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"; xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"; targetNamespace="http://impl.services.autoscaler.stratos.apache.org";> + <wsdl:types> + <xs:schema xmlns:ax214="http://io.java/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://rmi.java/xsd";> ++>>>>>>> upstream/master <xs:import namespace="http://io.java/xsd"/> <xs:complexType name="RemoteException"> <xs:complexContent> @@@ -33,13 -33,13 +39,21 @@@ </xs:sequence> </xs:complexType> </xs:schema> ++<<<<<<< HEAD + <xs:schema xmlns:ax26="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd";> ++======= + <xs:schema xmlns:ax23="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd";> ++>>>>>>> upstream/master <xs:import namespace="http://common.stratos.apache.org/xsd"/> <xs:complexType name="ApplicationContext"> <xs:sequence> <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="components" nillable="true" type="ax25:ComponentContext"/> ++======= + <xs:element minOccurs="0" name="components" nillable="true" type="ax21:ComponentContext"/> ++>>>>>>> upstream/master <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="multiTenant" type="xs:boolean"/> <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> @@@ -52,10 -52,10 +66,17 @@@ </xs:complexType> <xs:complexType name="ComponentContext"> <xs:sequence> ++<<<<<<< HEAD + <xs:element maxOccurs="unbounded" minOccurs="0" name="applicationClusterContexts" nillable="true" type="ax25:ApplicationClusterContext"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax25:CartridgeContext"/> + <xs:element minOccurs="0" name="dependencyContext" nillable="true" type="ax25:DependencyContext"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax25:GroupContext"/> ++======= + <xs:element maxOccurs="unbounded" minOccurs="0" name="applicationClusterContexts" nillable="true" type="ax21:ApplicationClusterContext"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax21:CartridgeContext"/> + <xs:element minOccurs="0" name="dependencyContext" nillable="true" type="ax21:DependencyContext"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax21:GroupContext"/> ++>>>>>>> upstream/master </xs:sequence> </xs:complexType> <xs:complexType name="ApplicationClusterContext"> @@@ -66,8 -66,8 +87,13 @@@ <xs:element maxOccurs="unbounded" minOccurs="0" name="dependencyClusterIds" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="deploymentPolicyName" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="persistenceContext" nillable="true" type="ax25:PersistenceContext"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax26:Properties"/> ++======= + <xs:element minOccurs="0" name="persistenceContext" nillable="true" type="ax21:PersistenceContext"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax23:Properties"/> ++>>>>>>> upstream/master <xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="textPayload" nillable="true" type="xs:string"/> </xs:sequence> @@@ -75,7 -75,7 +101,11 @@@ <xs:complexType name="PersistenceContext"> <xs:sequence> <xs:element minOccurs="0" name="persistenceRequired" type="xs:boolean"/> ++<<<<<<< HEAD + <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax25:VolumeContext"/> ++======= + <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax21:VolumeContext"/> ++>>>>>>> upstream/master </xs:sequence> </xs:complexType> <xs:complexType name="VolumeContext"> @@@ -94,21 -94,21 +124,34 @@@ <xs:sequence> <xs:element minOccurs="0" name="cartridgeMax" type="xs:int"/> <xs:element minOccurs="0" name="cartridgeMin" type="xs:int"/> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax25:SubscribableInfoContext"/> ++======= + <xs:element minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax21:SubscribableInfoContext"/> ++>>>>>>> upstream/master <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> <xs:complexType name="SubscribableInfoContext"> <xs:sequence> <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"/> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="artifactRepositoryContext" nillable="true" type="ax25:ArtifactRepositoryContext"/> ++======= + <xs:element minOccurs="0" name="artifactRepositoryContext" nillable="true" type="ax21:ArtifactRepositoryContext"/> ++>>>>>>> upstream/master <xs:element minOccurs="0" name="autoscalingPolicy" nillable="true" type="xs:string"/> <xs:element maxOccurs="unbounded" minOccurs="0" name="dependencyAliases" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="maxMembers" type="xs:int"/> <xs:element minOccurs="0" name="minMembers" type="xs:int"/> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="persistenceContext" nillable="true" type="ax25:PersistenceContext"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax26:Properties"/> ++======= + <xs:element minOccurs="0" name="persistenceContext" nillable="true" type="ax21:PersistenceContext"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax23:Properties"/> ++>>>>>>> upstream/master </xs:sequence> </xs:complexType> <xs:complexType name="ArtifactRepositoryContext"> @@@ -130,9 -130,9 +173,15 @@@ <xs:complexType name="GroupContext"> <xs:sequence> <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"/> ++<<<<<<< HEAD + <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax25:CartridgeContext"/> + <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="xs:string"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax25:GroupContext"/> ++======= + <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax21:CartridgeContext"/> + <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="xs:string"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax21:GroupContext"/> ++>>>>>>> upstream/master <xs:element minOccurs="0" name="groupMaxInstances" type="xs:int"/> <xs:element minOccurs="0" name="groupMinInstances" type="xs:int"/> <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> @@@ -156,69 -156,116 +205,156 @@@ </xs:sequence> </xs:complexType> </xs:schema> ++<<<<<<< HEAD + <xs:schema xmlns:ax29="http://application.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax27="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ax24="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax216="http://rmi.java/xsd"; xmlns:ax218="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax220="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax222="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax224="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax226="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.autoscaler.stratos.apache.org";> ++======= + <xs:schema xmlns:ax26="http://application.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax24="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ax217="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax219="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax215="http://rmi.java/xsd"; xmlns:ax222="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax224="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax211="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax226="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.autoscaler.stratos.apache.org";> + <xs:import namespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd"/> + <xs:import namespace="http://application.exception.autoscaler.stratos.apache.org/xsd"/> ++>>>>>>> upstream/master <xs:import namespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"/> + <xs:import namespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd"/> + <xs:import namespace="http://application.exception.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://rmi.java/xsd"/> <xs:import namespace="http://policy.exception.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://exception.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://pojo.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://common.stratos.apache.org/xsd"/> ++<<<<<<< HEAD + <xs:element name="getApplicationPolicy"> ++======= + <xs:element name="getApplication"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getApplicationResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" nillable="true" type="ax24:ApplicationContext"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="AutoscalerServiceApplicationDefinitionException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax25:ApplicationDefinitionException"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="updateApplication"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax24:ApplicationContext"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="updateApplicationResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="deleteApplication"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="deleteApplicationResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getDeploymentPolicies"> ++>>>>>>> upstream/master <xs:complexType> - <xs:sequence/> + <xs:sequence> + <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/> + </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getDeploymentPoliciesResponse"> + <xs:element name="getApplicationPolicyResponse"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="return" nillable="true" type="ax24:ApplicationPolicy"/> ++======= + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax27:DeploymentPolicy"/> ++>>>>>>> upstream/master </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceRemoteException"> + <xs:element name="getApplication"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> ++======= + <xs:element minOccurs="0" name="RemoteException" nillable="true" type="ax215:RemoteException"/> ++>>>>>>> upstream/master </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceInvalidDeploymentPolicyException"> + <xs:element name="getApplicationResponse"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="return" nillable="true" type="ax27:ApplicationContext"/> ++======= + <xs:element minOccurs="0" name="InvalidDeploymentPolicyException" nillable="true" type="ax217:InvalidDeploymentPolicyException"/> ++>>>>>>> upstream/master </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceDeploymentPolicyNotExistsException"> + <xs:element name="AutoscalerServiceApplicationDefinitionException"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax29:ApplicationDefinitionException"/> ++======= + <xs:element minOccurs="0" name="DeploymentPolicyNotExistsException" nillable="true" type="ax217:DeploymentPolicyNotExistsException"/> ++>>>>>>> upstream/master </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceInvalidPolicyException"> + <xs:element name="updateApplication"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax27:ApplicationContext"/> ++======= + <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax217:InvalidPolicyException"/> ++>>>>>>> upstream/master </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceCloudControllerConnectionException"> + <xs:element name="updateApplicationResponse"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="return" type="xs:boolean"/> ++======= + <xs:element minOccurs="0" name="CloudControllerConnectionException" nillable="true" type="ax219:CloudControllerConnectionException"/> ++>>>>>>> upstream/master </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateDeploymentPolicy"> + <xs:element name="deleteApplication"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> ++======= + <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax27:DeploymentPolicy"/> ++>>>>>>> upstream/master </xs:sequence> </xs:complexType> </xs:element> @@@ -229,22 -276,17 +365,30 @@@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceInvalidApplicationPolicyException"> + <xs:element name="getDeploymentPolicies"> + <xs:complexType> + <xs:sequence/> + </xs:complexType> + </xs:element> + <xs:element name="getDeploymentPoliciesResponse"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:DeploymentPolicy"/> ++======= + <xs:element minOccurs="0" name="InvalidApplicationPolicyException" nillable="true" type="ax25:InvalidApplicationPolicyException"/> ++>>>>>>> upstream/master </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addApplicationPolicy"> + <xs:element name="AutoscalerServiceRemoteException"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="RemoteException" nillable="true" type="ax216:RemoteException"/> ++======= + <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax27:ApplicationPolicy"/> ++>>>>>>> upstream/master </xs:sequence> </xs:complexType> </xs:element> @@@ -269,17 -311,17 +413,25 @@@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceApplicatioinPolicyNotExistsException"> + <xs:element name="AutoscalerServiceCloudControllerConnectionException"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="CloudControllerConnectionException" nillable="true" type="ax219:CloudControllerConnectionException"/> ++======= + <xs:element minOccurs="0" name="ApplicatioinPolicyNotExistsException" nillable="true" type="ax217:ApplicatioinPolicyNotExistsException"/> ++>>>>>>> upstream/master </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateApplicationPolicy"> + <xs:element name="updateDeploymentPolicy"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax24:DeploymentPolicy"/> ++======= + <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax27:ApplicationPolicy"/> ++>>>>>>> upstream/master </xs:sequence> </xs:complexType> </xs:element> @@@ -290,31 -332,83 +442,97 @@@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getApplicationPolicies"> + <xs:element name="AutoscalerServiceInvalidApplicationPolicyException"> <xs:complexType> - <xs:sequence/> + <xs:sequence> + <xs:element minOccurs="0" name="InvalidApplicationPolicyException" nillable="true" type="ax29:InvalidApplicationPolicyException"/> + </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getApplicationPoliciesResponse"> + <xs:element name="addApplicationPolicy"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax24:ApplicationPolicy"/> ++======= + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax27:ApplicationPolicy"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="serviceGroupExist"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="serviceName" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="serviceGroupExistResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="AutoscalerServiceAutoScalerException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="AutoScalerException" nillable="true" type="ax219:AutoScalerException"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getServiceGroups"> + <xs:complexType> + <xs:sequence/> + </xs:complexType> + </xs:element> + <xs:element name="getServiceGroupsResponse"> + <xs:complexType> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax221:ServiceGroup"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="AutoscalerServiceCartridgeGroupNotFoundException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="CartridgeGroupNotFoundException" nillable="true" type="ax219:CartridgeGroupNotFoundException"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="removeServiceGroup"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="groupName" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="removeServiceGroupResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> ++>>>>>>> upstream/master </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceAutoScalingPolicyAlreadyExistException"> + <xs:element name="addApplicationPolicyResponse"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="return" type="xs:boolean"/> ++======= + <xs:element minOccurs="0" name="AutoScalingPolicyAlreadyExistException" nillable="true" type="ax219:AutoScalingPolicyAlreadyExistException"/> ++>>>>>>> upstream/master </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addAutoScalingPolicy"> + <xs:element name="removeApplicationPolicy"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/> ++======= + <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax223:AutoscalePolicy"/> ++>>>>>>> upstream/master </xs:sequence> </xs:complexType> </xs:element> @@@ -325,17 -419,22 +543,25 @@@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getAutoScalingPolicies"> - <xs:complexType> - <xs:sequence/> - </xs:complexType> - </xs:element> - <xs:element name="getAutoScalingPoliciesResponse"> + <xs:element name="AutoscalerServiceApplicatioinPolicyNotExistsException"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="ApplicatioinPolicyNotExistsException" nillable="true" type="ax217:ApplicatioinPolicyNotExistsException"/> ++======= + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax223:AutoscalePolicy"/> ++>>>>>>> upstream/master </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateAutoScalingPolicy"> + <xs:element name="updateApplicationPolicy"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax24:ApplicationPolicy"/> ++======= + <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax223:AutoscalePolicy"/> ++>>>>>>> upstream/master </xs:sequence> </xs:complexType> </xs:element> @@@ -346,22 -445,17 +572,30 @@@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceUnremovablePolicyException"> + <xs:element name="getApplicationPolicies"> + <xs:complexType> + <xs:sequence/> + </xs:complexType> + </xs:element> + <xs:element name="getApplicationPoliciesResponse"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:ApplicationPolicy"/> ++======= + <xs:element minOccurs="0" name="UnremovablePolicyException" nillable="true" type="ax217:UnremovablePolicyException"/> ++>>>>>>> upstream/master </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServicePolicyDoesNotExistException"> + <xs:element name="AutoscalerServiceInvalidServiceGroupException"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax29:InvalidServiceGroupException"/> ++======= + <xs:element minOccurs="0" name="PolicyDoesNotExistException" nillable="true" type="ax217:PolicyDoesNotExistException"/> ++>>>>>>> upstream/master </xs:sequence> </xs:complexType> </xs:element> @@@ -393,22 -487,18 +627,26 @@@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="deployApplication"> ++<<<<<<< HEAD + <xs:element name="AutoscalerServiceAutoScalerException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="AutoScalerException" nillable="true" type="ax219:AutoScalerException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="deployApplicationResponse"> + <xs:element name="getServiceGroups"> ++======= ++ <xs:element name="deployApplication"> ++>>>>>>> upstream/master + <xs:complexType> + <xs:sequence/> + </xs:complexType> + </xs:element> + <xs:element name="getServiceGroupsResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax221:ServiceGroup"/> </xs:sequence> </xs:complexType> </xs:element> @@@ -426,36 -517,39 +664,55 @@@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceInvalidArgumentException"> + <xs:element name="removeServiceGroupResponse"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="return" type="xs:boolean"/> ++======= + <xs:element minOccurs="0" name="InvalidArgumentException" nillable="true" type="ax219:InvalidArgumentException"/> ++>>>>>>> upstream/master </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateClusterMonitor"> + <xs:element name="getApplications"> <xs:complexType> ++<<<<<<< HEAD + <xs:sequence/> ++======= + <xs:sequence> + <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax22:Properties"/> + </xs:sequence> ++>>>>>>> upstream/master </xs:complexType> </xs:element> - <xs:element name="updateClusterMonitorResponse"> + <xs:element name="getApplicationsResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax27:ApplicationContext"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceInvalidServiceGroupException"> + <xs:element name="addApplication"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax27:ApplicationContext"/> ++======= + <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax25:InvalidServiceGroupException"/> ++>>>>>>> upstream/master </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addServiceGroup"> + <xs:element name="addApplicationResponse"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="return" type="xs:boolean"/> ++======= + <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax221:ServiceGroup"/> ++>>>>>>> upstream/master </xs:sequence> </xs:complexType> </xs:element> @@@ -480,17 -575,10 +737,21 @@@ </xs:sequence> </xs:complexType> </xs:element> ++<<<<<<< HEAD + <xs:element name="getAutoscalingPolicyResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" nillable="true" type="ax223:AutoscalePolicy"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getDeploymentPolicy"> ++======= + <xs:element name="getApplicationNetworkPartitions"> ++>>>>>>> upstream/master <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> @@@ -501,17 -589,17 +762,25 @@@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceDeploymentPolicyAlreadyExistsException"> + <xs:element name="AutoscalerServiceAutoScalingPolicyAlreadyExistException"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="AutoScalingPolicyAlreadyExistException" nillable="true" type="ax219:AutoScalingPolicyAlreadyExistException"/> ++======= + <xs:element minOccurs="0" name="DeploymentPolicyAlreadyExistsException" nillable="true" type="ax217:DeploymentPolicyAlreadyExistsException"/> ++>>>>>>> upstream/master </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addDeployementPolicy"> + <xs:element name="addAutoScalingPolicy"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax223:AutoscalePolicy"/> ++======= + <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax27:DeploymentPolicy"/> ++>>>>>>> upstream/master </xs:sequence> </xs:complexType> </xs:element> @@@ -548,10 -624,10 +817,11 @@@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="undeployServiceGroup"> ++<<<<<<< HEAD + <xs:element name="AutoscalerServiceUnremovablePolicyException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="UnremovablePolicyException" nillable="true" type="ax217:UnremovablePolicyException"/> </xs:sequence> </xs:complexType> </xs:element> @@@ -605,104 -638,57 +875,144 @@@ </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="undeployApplication"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="force" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="undeployApplicationResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="AutoscalerServiceInvalidArgumentException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="InvalidArgumentException" nillable="true" type="ax219:InvalidArgumentException"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="updateClusterMonitor"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax22:Properties"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="updateClusterMonitorResponse"> ++======= + <xs:element name="getApplicationPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getApplicationPolicyResponse"> ++>>>>>>> upstream/master + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" nillable="true" type="ax27:ApplicationPolicy"/> </xs:sequence> </xs:complexType> </xs:element> ++<<<<<<< HEAD + <xs:element name="addServiceGroup"> ++======= + <xs:element name="getApplications"> ++>>>>>>> upstream/master <xs:complexType> - <xs:sequence/> + <xs:sequence> + <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax221:ServiceGroup"/> + </xs:sequence> + </xs:complexType> + </xs:element> ++<<<<<<< HEAD + <xs:element name="addServiceGroupResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="findClusterId"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="findClusterIdResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/> + </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="getApplicationNetworkPartitions"> ++======= + <xs:element name="getApplicationsResponse"> + <xs:complexType> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:ApplicationContext"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="addApplication"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax24:ApplicationContext"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="addApplicationResponse"> ++>>>>>>> upstream/master <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> ++<<<<<<< HEAD + <xs:element name="getApplicationNetworkPartitionsResponse"> + <xs:complexType> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="AutoscalerServiceDeploymentPolicyAlreadyExistsException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="DeploymentPolicyAlreadyExistsException" nillable="true" type="ax217:DeploymentPolicyAlreadyExistsException"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="addDeployementPolicy"> ++======= + <xs:element name="getServiceGroup"> ++>>>>>>> upstream/master <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax24:DeploymentPolicy"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroupResponse"> + <xs:element name="addDeployementPolicyResponse"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="return" type="xs:boolean"/> ++======= + <xs:element minOccurs="0" name="return" nillable="true" type="ax221:ServiceGroup"/> ++>>>>>>> upstream/master </xs:sequence> </xs:complexType> </xs:element> @@@ -713,10 -699,10 +1023,14 @@@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getAutoscalingPolicyResponse"> + <xs:element name="removeDeployementPolicyResponse"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="return" type="xs:boolean"/> ++======= + <xs:element minOccurs="0" name="return" nillable="true" type="ax223:AutoscalePolicy"/> ++>>>>>>> upstream/master </xs:sequence> </xs:complexType> </xs:element> @@@ -727,41 -713,41 +1041,66 @@@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getDeploymentPolicyResponse"> + <xs:element name="undeployServiceGroupResponse"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="return" type="xs:boolean"/> ++======= + <xs:element minOccurs="0" name="return" nillable="true" type="ax27:DeploymentPolicy"/> ++>>>>>>> upstream/master </xs:sequence> </xs:complexType> </xs:element> </xs:schema> ++<<<<<<< HEAD + <xs:schema xmlns:ax23="http://common.stratos.apache.org/xsd"; xmlns:ax212="http://partition.common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd";> + <xs:import namespace="http://common.stratos.apache.org/xsd"/> + <xs:import namespace="http://partition.common.stratos.apache.org/xsd"/> ++======= + <xs:schema xmlns:ax220="http://common.stratos.apache.org/xsd"; xmlns:ax210="http://partition.common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd";> + <xs:import namespace="http://partition.common.stratos.apache.org/xsd"/> + <xs:import namespace="http://common.stratos.apache.org/xsd"/> + <xs:complexType name="DeploymentPolicy"> + <xs:sequence> + <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionRefs" nillable="true" type="ax28:NetworkPartitionRef"/> + </xs:sequence> + </xs:complexType> ++>>>>>>> upstream/master <xs:complexType name="ApplicationPolicy"> <xs:sequence> <xs:element minOccurs="0" name="algorithm" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionGroups" nillable="true" type="xs:string"/> <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitions" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax23:Properties"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax22:Properties"/> </xs:sequence> </xs:complexType> + <xs:complexType name="DeploymentPolicy"> + <xs:sequence> + <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionRefs" nillable="true" type="ax212:NetworkPartitionRef"/> + </xs:sequence> + </xs:complexType> </xs:schema> ++<<<<<<< HEAD + <xs:schema xmlns:ax211="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.common.stratos.apache.org/xsd";> ++======= + <xs:schema xmlns:ax29="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.common.stratos.apache.org/xsd";> ++>>>>>>> upstream/master <xs:import namespace="http://common.stratos.apache.org/xsd"/> <xs:complexType name="NetworkPartitionRef"> <xs:sequence> <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="partitionAlgo" nillable="true" type="xs:string"/> ++<<<<<<< HEAD + <xs:element maxOccurs="unbounded" minOccurs="0" name="partitionRefs" nillable="true" type="ax210:PartitionRef"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax210:PartitionRef"/> ++======= + <xs:element maxOccurs="unbounded" minOccurs="0" name="partitionRefs" nillable="true" type="ax28:PartitionRef"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax28:PartitionRef"/> ++>>>>>>> upstream/master </xs:sequence> </xs:complexType> <xs:complexType name="PartitionRef"> @@@ -770,7 -756,7 +1109,11 @@@ <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="partitionMax" type="xs:int"/> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="properties" nillable="true" type="ax211:Properties"/> ++======= + <xs:element minOccurs="0" name="properties" nillable="true" type="ax29:Properties"/> ++>>>>>>> upstream/master </xs:sequence> </xs:complexType> </xs:schema> @@@ -824,14 -810,14 +1167,22 @@@ </xs:complexType> <xs:complexType name="UnremovablePolicyException"> <xs:complexContent> ++<<<<<<< HEAD + <xs:extension base="ax225:AutoScalerException"> ++======= + <xs:extension base="ax218:AutoScalerException"> ++>>>>>>> upstream/master <xs:sequence/> </xs:extension> </xs:complexContent> </xs:complexType> <xs:complexType name="PolicyDoesNotExistException"> <xs:complexContent> ++<<<<<<< HEAD + <xs:extension base="ax225:AutoScalerException"> ++======= + <xs:extension base="ax218:AutoScalerException"> ++>>>>>>> upstream/master <xs:sequence/> </xs:extension> </xs:complexContent>
