You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/02/25 19:55:19 UTC

[44/50] [abbrv] stratos git commit: fixing STRATOS-1214 - deployement policy changes

http://git-wip-us.apache.org/repos/asf/stratos/blob/31601e5a/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
----------------------------------------------------------------------
diff --git 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
index 20a364e..5b9ce9a 100644
--- 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
@@ -1,4 +1,7 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
 <wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns="http://impl.services.controller.cloud.stratos.apache.org" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ax228="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ax231="http://topology.domain.messaging.stratos.apache.org/xsd" xmlns:ax222="http://exception.controller.cloud.stratos.apache.org/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:ax224="http://domain.controller.cloud.stratos.apache.org/xsd" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:ax226="http://common.stratos.apache.org/xsd" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://impl.services.controller.cloud.stratos.apache.org">
     <wsdl:documentation>CloudControllerService</wsdl:documentation>
     <wsdl:types>
@@ -15,6 +18,7 @@
             <xs:import namespace="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd"></xs:import>
             <xs:import namespace="http://topology.domain.messaging.stratos.apache.org/xsd"></xs:import>
 <<<<<<< HEAD
+<<<<<<< HEAD
             <xs:element name="CloudControllerServiceDeploymentPolicyNotExistsException">
                 <xs:complexType>
                     <xs:sequence>
@@ -99,12 +103,19 @@
                 <xs:complexType>
                     <xs:sequence>
                         <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"></xs:element>
+=======
+            <xs:element name="CloudControllerServiceDeploymentPolicyNotExistsException">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="DeploymentPolicyNotExistsException" nillable="true" type="ax222:DeploymentPolicyNotExistsException"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="CloudControllerServiceInvalidCartridgeTypeException">
+            <xs:element name="getDeploymentPolicy">
                 <xs:complexType>
                     <xs:sequence>
+<<<<<<< HEAD
                         <xs:element minOccurs="0" name="InvalidCartridgeTypeException" nillable="true" type="ax222:InvalidCartridgeTypeException"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
@@ -281,6 +292,132 @@
                 </xs:complexType>
             </xs:element>
             <xs:element name="removeNetworkPartition">
+=======
+                        <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getDeploymentPolicyResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return" nillable="true" type="ax224:DeploymentPolicy"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getDeploymentPolicies">
+                <xs:complexType>
+                    <xs:sequence></xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getDeploymentPoliciesResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax224:DeploymentPolicy"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="CloudControllerServiceInvalidCartridgeDefinitionException">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="InvalidCartridgeDefinitionException" nillable="true" type="ax222:InvalidCartridgeDefinitionException"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="CloudControllerServiceInvalidIaasProviderException">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="InvalidIaasProviderException" nillable="true" type="ax222:InvalidIaasProviderException"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="CloudControllerServiceCartridgeDefinitionNotExistsException">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="CartridgeDefinitionNotExistsException" nillable="true" type="ax222:CartridgeDefinitionNotExistsException"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="updateCartridge">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="cartridgeConfig" nillable="true" type="ax224:CartridgeConfig"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getCartridges">
+                <xs:complexType>
+                    <xs:sequence></xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getCartridgesResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="CloudControllerServiceInvalidCartridgeTypeException">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="InvalidCartridgeTypeException" nillable="true" type="ax222:InvalidCartridgeTypeException"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="removeCartridge">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="CloudControllerServiceNetworkPartitionAlreadyExistsException">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="NetworkPartitionAlreadyExistsException" nillable="true" type="ax222:NetworkPartitionAlreadyExistsException"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="addNetworkPartition">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="networkPartition" nillable="true" type="ax224:NetworkPartition"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getNetworkPartitions">
+                <xs:complexType>
+                    <xs:sequence></xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getNetworkPartitionsResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax224:NetworkPartition"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getNetworkPartition">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getNetworkPartitionResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return" nillable="true" type="ax224:NetworkPartition"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="CloudControllerServiceNetworkPartitionNotExistsException">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="NetworkPartitionNotExistsException" nillable="true" type="ax222:NetworkPartitionNotExistsException"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="removeNetworkPartition">
                 <xs:complexType>
                     <xs:sequence>
                         <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"></xs:element>
@@ -317,12 +454,61 @@
                 </xs:complexType>
             </xs:element>
             <xs:element name="addKubernetesHostResponse">
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
+                        <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+<<<<<<< HEAD
+            <xs:element name="updateNetworkPartition">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="networkPartition" nillable="true" type="ax224:NetworkPartition"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="CloudControllerServiceInvalidKubernetesHostException">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="InvalidKubernetesHostException" nillable="true" type="ax222:InvalidKubernetesHostException"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="CloudControllerServiceNonExistingKubernetesClusterException">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="NonExistingKubernetesClusterException" nillable="true" type="ax222:NonExistingKubernetesClusterException"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="addKubernetesHost">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"></xs:element>
+                        <xs:element minOccurs="0" name="kubernetesHost" nillable="true" type="ax230:KubernetesHost"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="addKubernetesHostResponse">
+=======
+            <xs:element name="CloudControllerServiceInvalidKubernetesMasterException">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="InvalidKubernetesMasterException" nillable="true" type="ax222:InvalidKubernetesMasterException"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
+            <xs:element name="CloudControllerServiceNonExistingKubernetesMasterException">
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="NonExistingKubernetesMasterException" nillable="true" type="ax222:NonExistingKubernetesMasterException"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+<<<<<<< HEAD
             <xs:element name="CloudControllerServiceInvalidKubernetesMasterException">
 =======
             <xs:element name="updateNetworkPartition">
@@ -351,19 +537,58 @@
                     <xs:sequence>
                         <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"></xs:element>
                         <xs:element minOccurs="0" name="kubernetesHost" nillable="true" type="ax233:KubernetesHost"></xs:element>
+=======
+            <xs:element name="updateKubernetesMaster">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="kubernetesMaster" nillable="true" type="ax230:KubernetesMaster"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="updateKubernetesMasterResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="CloudControllerServiceNonExistingKubernetesHostException">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="NonExistingKubernetesHostException" nillable="true" type="ax222:NonExistingKubernetesHostException"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="updateKubernetesHost">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="kubernetesHost" nillable="true" type="ax230:KubernetesHost"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="updateKubernetesHostResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="addKubernetesHostResponse">
                 <xs:complexType>
                     <xs:sequence>
+<<<<<<< HEAD
                         <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
+=======
+                        <xs:element minOccurs="0" name="CartridgeAlreadyExistsException" nillable="true" type="ax222:CartridgeAlreadyExistsException"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="CloudControllerServiceInvalidKubernetesMasterException">
                 <xs:complexType>
                     <xs:sequence>
+<<<<<<< HEAD
                         <xs:element minOccurs="0" name="InvalidKubernetesMasterException" nillable="true" type="ax228:InvalidKubernetesMasterException"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
@@ -484,188 +709,354 @@
                 </xs:complexType>
             </xs:element>
             <xs:element name="addKubernetesClusterResponse">
+=======
+                        <xs:element minOccurs="0" name="cartridgeConfig" nillable="true" type="ax224:CartridgeConfig"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="CloudControllerServiceInvalidKubernetesClusterException">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="InvalidKubernetesClusterException" nillable="true" type="ax222:InvalidKubernetesClusterException"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="addKubernetesCluster">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="kubernetesCluster" nillable="true" type="ax230:KubernetesCluster"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="addKubernetesClusterResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getKubernetesCluster">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getKubernetesClusterResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return" nillable="true" type="ax230:KubernetesCluster"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="removeKubernetesCluster">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="removeKubernetesClusterResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="removeKubernetesHost">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="kubernetesHostId" nillable="true" type="xs:string"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="removeKubernetesHostResponse">
                 <xs:complexType>
                     <xs:sequence>
                         <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
+            <xs:element name="CloudControllerServiceInvalidServiceGroupException">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax222:InvalidServiceGroupException"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getServiceGroupSubGroups">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getServiceGroupSubGroupsResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getServiceGroupCartridges">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getServiceGroupCartridgesResponse">
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+<<<<<<< HEAD
             <xs:element name="getKubernetesCluster">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"></xs:element>
+                        <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getKubernetesClusterResponse">
+                <xs:complexType>
+                    <xs:sequence>
+<<<<<<< HEAD
+                        <xs:element minOccurs="0" name="return" nillable="true" type="ax230:KubernetesCluster"></xs:element>
+=======
+                        <xs:element minOccurs="0" name="return" nillable="true" type="ax233:KubernetesCluster"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="removeKubernetesCluster">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="removeKubernetesClusterResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="removeKubernetesHost">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="kubernetesHostId" nillable="true" type="xs:string"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getKubernetesClusterResponse">
+            <xs:element name="removeKubernetesHostResponse">
                 <xs:complexType>
                     <xs:sequence>
-<<<<<<< HEAD
-                        <xs:element minOccurs="0" name="return" nillable="true" type="ax230:KubernetesCluster"></xs:element>
+                        <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
 =======
-                        <xs:element minOccurs="0" name="return" nillable="true" type="ax233:KubernetesCluster"></xs:element>
->>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+            <xs:element name="getServiceGroupDependencies">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="removeKubernetesCluster">
+            <xs:element name="getServiceGroupDependenciesResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"></xs:element>
+                        <xs:element minOccurs="0" name="return" nillable="true" type="ax224:Dependencies"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="removeKubernetesClusterResponse">
+            <xs:element name="CloudControllerServiceCartridgeNotFoundException">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
+                        <xs:element minOccurs="0" name="CartridgeNotFoundException" nillable="true" type="ax222:CartridgeNotFoundException"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="removeKubernetesHost">
+            <xs:element name="CloudControllerServiceCloudControllerException">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="kubernetesHostId" nillable="true" type="xs:string"></xs:element>
+                        <xs:element minOccurs="0" name="CloudControllerException" nillable="true" type="ax222:CloudControllerException"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="removeKubernetesHostResponse">
+            <xs:element name="startInstances">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
+                        <xs:element maxOccurs="unbounded" minOccurs="0" name="instanceContexts" nillable="true" type="ax224:InstanceContext"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="CloudControllerServiceInvalidServiceGroupException">
+            <xs:element name="startInstancesResponse">
                 <xs:complexType>
                     <xs:sequence>
 <<<<<<< HEAD
+<<<<<<< HEAD
                         <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax222:InvalidServiceGroupException"></xs:element>
 =======
                         <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax228:InvalidServiceGroupException"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                        <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax224:MemberContext"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getServiceGroupSubGroups">
+            <xs:element name="CloudControllerServiceInvalidClusterException">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element>
+                        <xs:element minOccurs="0" name="InvalidClusterException" nillable="true" type="ax222:InvalidClusterException"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getServiceGroupSubGroupsResponse">
+            <xs:element name="terminateInstances">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"></xs:element>
+                        <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getServiceGroupCartridges">
+            <xs:element name="getCartridgeInfo">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element>
+                        <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getServiceGroupCartridgesResponse">
+            <xs:element name="getCartridgeInfoResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"></xs:element>
+                        <xs:element minOccurs="0" name="return" nillable="true" type="ax224:CartridgeInfo"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getServiceGroupDependencies">
+            <xs:element name="CloudControllerServiceInvalidPartitionException">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element>
+                        <xs:element minOccurs="0" name="InvalidPartitionException" nillable="true" type="ax222:InvalidPartitionException"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getServiceGroupDependenciesResponse">
+            <xs:element name="validateDeploymentPolicy">
                 <xs:complexType>
                     <xs:sequence>
 <<<<<<< HEAD
+<<<<<<< HEAD
                         <xs:element minOccurs="0" name="return" nillable="true" type="ax224:Dependencies"></xs:element>
 =======
                         <xs:element minOccurs="0" name="return" nillable="true" type="ax225:Dependencies"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                        <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element>
+                        <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax224:Partition"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="CloudControllerServiceCartridgeNotFoundException">
+            <xs:element name="validateDeploymentPolicyResponse">
                 <xs:complexType>
                     <xs:sequence>
 <<<<<<< HEAD
+<<<<<<< HEAD
                         <xs:element minOccurs="0" name="CartridgeNotFoundException" nillable="true" type="ax222:CartridgeNotFoundException"></xs:element>
 =======
                         <xs:element minOccurs="0" name="CartridgeNotFoundException" nillable="true" type="ax228:CartridgeNotFoundException"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                        <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="CloudControllerServiceCloudControllerException">
+            <xs:element name="validatePartition">
                 <xs:complexType>
                     <xs:sequence>
 <<<<<<< HEAD
+<<<<<<< HEAD
                         <xs:element minOccurs="0" name="CloudControllerException" nillable="true" type="ax222:CloudControllerException"></xs:element>
 =======
                         <xs:element minOccurs="0" name="CloudControllerException" nillable="true" type="ax228:CloudControllerException"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                        <xs:element minOccurs="0" name="partition" nillable="true" type="ax224:Partition"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="startInstances">
+            <xs:element name="validatePartitionResponse">
                 <xs:complexType>
                     <xs:sequence>
 <<<<<<< HEAD
+<<<<<<< HEAD
                         <xs:element maxOccurs="unbounded" minOccurs="0" name="instanceContexts" nillable="true" type="ax224:InstanceContext"></xs:element>
 =======
                         <xs:element maxOccurs="unbounded" minOccurs="0" name="instanceContexts" nillable="true" type="ax225:InstanceContext"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                        <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="startInstancesResponse">
+            <xs:element name="getClusterContext">
                 <xs:complexType>
                     <xs:sequence>
 <<<<<<< HEAD
+<<<<<<< HEAD
                         <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax224:MemberContext"></xs:element>
 =======
                         <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax225:MemberContext"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                        <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="CloudControllerServiceInvalidClusterException">
+            <xs:element name="getClusterContextResponse">
                 <xs:complexType>
                     <xs:sequence>
 <<<<<<< HEAD
+<<<<<<< HEAD
                         <xs:element minOccurs="0" name="InvalidClusterException" nillable="true" type="ax222:InvalidClusterException"></xs:element>
 =======
                         <xs:element minOccurs="0" name="InvalidClusterException" nillable="true" type="ax228:InvalidClusterException"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                        <xs:element minOccurs="0" name="return" nillable="true" type="ax224:ClusterContext"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="terminateInstances">
+            <xs:element name="updateClusterStatus">
                 <xs:complexType>
                     <xs:sequence>
+                        <xs:element minOccurs="0" name="serviceName" 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="instanceId" nillable="true" type="xs:string"></xs:element>
+                        <xs:element minOccurs="0" name="status" nillable="true" type="ax232:ClusterStatus"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getCartridgeInfo">
+            <xs:element name="CloudControllerServiceApplicationClusterRegistrationException">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element>
+                        <xs:element minOccurs="0" name="ApplicationClusterRegistrationException" nillable="true" type="ax222:ApplicationClusterRegistrationException"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getCartridgeInfoResponse">
+            <xs:element name="createApplicationClusters">
                 <xs:complexType>
                     <xs:sequence>
 <<<<<<< HEAD
+<<<<<<< HEAD
                         <xs:element minOccurs="0" name="return" nillable="true" type="ax224:CartridgeInfo"></xs:element>
 =======
                         <xs:element minOccurs="0" name="return" nillable="true" type="ax225:CartridgeInfo"></xs:element>
@@ -773,6 +1164,10 @@
 =======
                         <xs:element maxOccurs="unbounded" minOccurs="0" name="appClustersContexts" nillable="true" type="ax225:ApplicationClusterContext"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                        <xs:element minOccurs="0" name="appId" nillable="true" type="xs:string"></xs:element>
+                        <xs:element maxOccurs="unbounded" minOccurs="0" name="appClustersContexts" nillable="true" type="ax224:ApplicationClusterContext"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
@@ -780,10 +1175,14 @@
                 <xs:complexType>
                     <xs:sequence>
 <<<<<<< HEAD
+<<<<<<< HEAD
                         <xs:element minOccurs="0" name="ClusterInstanceCreationException" nillable="true" type="ax222:ClusterInstanceCreationException"></xs:element>
 =======
                         <xs:element minOccurs="0" name="ClusterInstanceCreationException" nillable="true" type="ax228:ClusterInstanceCreationException"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                        <xs:element minOccurs="0" name="ClusterInstanceCreationException" nillable="true" type="ax222:ClusterInstanceCreationException"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
@@ -843,10 +1242,14 @@
                 <xs:complexType>
                     <xs:sequence>
 <<<<<<< HEAD
+<<<<<<< HEAD
                         <xs:element minOccurs="0" name="DeploymentPolicyAlreadyExistsException" nillable="true" type="ax222:DeploymentPolicyAlreadyExistsException"></xs:element>
 =======
                         <xs:element minOccurs="0" name="DeploymentPolicyAlreadyExistsException" nillable="true" type="ax228:DeploymentPolicyAlreadyExistsException"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                        <xs:element minOccurs="0" name="DeploymentPolicyAlreadyExistsException" nillable="true" type="ax222:DeploymentPolicyAlreadyExistsException"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
@@ -854,10 +1257,14 @@
                 <xs:complexType>
                     <xs:sequence>
 <<<<<<< HEAD
+<<<<<<< HEAD
                         <xs:element minOccurs="0" name="InvalidDeploymentPolicyException" nillable="true" type="ax222:InvalidDeploymentPolicyException"></xs:element>
 =======
                         <xs:element minOccurs="0" name="InvalidDeploymentPolicyException" nillable="true" type="ax228:InvalidDeploymentPolicyException"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                        <xs:element minOccurs="0" name="InvalidDeploymentPolicyException" nillable="true" type="ax222:InvalidDeploymentPolicyException"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
@@ -865,6 +1272,7 @@
                 <xs:complexType>
                     <xs:sequence>
 <<<<<<< HEAD
+<<<<<<< HEAD
                         <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax224:DeploymentPolicy"></xs:element>
 =======
                         <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax225:DeploymentPolicy"></xs:element>
@@ -876,6 +1284,9 @@
                     <xs:sequence>
                         <xs:element minOccurs="0" name="DeploymentPolicyNotExistsException" nillable="true" type="ax228:DeploymentPolicyNotExistsException"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                        <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax224:DeploymentPolicy"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
@@ -883,10 +1294,14 @@
                 <xs:complexType>
                     <xs:sequence>
 <<<<<<< HEAD
+<<<<<<< HEAD
                         <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax224:DeploymentPolicy"></xs:element>
 =======
                         <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax225:DeploymentPolicy"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                        <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax224:DeploymentPolicy"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
@@ -901,10 +1316,14 @@
                 <xs:complexType>
                     <xs:sequence>
 <<<<<<< HEAD
+<<<<<<< HEAD
                         <xs:element minOccurs="0" name="InvalidMemberException" nillable="true" type="ax222:InvalidMemberException"></xs:element>
 =======
                         <xs:element minOccurs="0" name="UnregisteredClusterException" nillable="true" type="ax228:UnregisteredClusterException"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                        <xs:element minOccurs="0" name="InvalidMemberException" nillable="true" type="ax222:InvalidMemberException"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
@@ -916,6 +1335,7 @@
                 </xs:complexType>
             </xs:element>
 <<<<<<< HEAD
+<<<<<<< HEAD
             <xs:element name="CloudControllerServiceUnregisteredClusterException">
                 <xs:complexType>
                     <xs:sequence>
@@ -940,6 +1360,12 @@
                     <xs:sequence>
                         <xs:element minOccurs="0" name="InvalidMemberException" nillable="true" type="ax228:InvalidMemberException"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+            <xs:element name="CloudControllerServiceUnregisteredClusterException">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="UnregisteredClusterException" nillable="true" type="ax222:UnregisteredClusterException"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
@@ -954,10 +1380,14 @@
                 <xs:complexType>
                     <xs:sequence>
 <<<<<<< HEAD
+<<<<<<< HEAD
                         <xs:element minOccurs="0" name="instanceContext" nillable="true" type="ax224:InstanceContext"></xs:element>
 =======
                         <xs:element minOccurs="0" name="instanceContext" nillable="true" type="ax225:InstanceContext"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                        <xs:element minOccurs="0" name="instanceContext" nillable="true" type="ax224:InstanceContext"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
@@ -965,10 +1395,14 @@
                 <xs:complexType>
                     <xs:sequence>
 <<<<<<< HEAD
+<<<<<<< HEAD
                         <xs:element minOccurs="0" name="return" nillable="true" type="ax224:MemberContext"></xs:element>
 =======
                         <xs:element minOccurs="0" name="return" nillable="true" type="ax225:MemberContext"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                        <xs:element minOccurs="0" name="return" nillable="true" type="ax224:MemberContext"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
@@ -976,10 +1410,14 @@
                 <xs:complexType>
                     <xs:sequence>
 <<<<<<< HEAD
+<<<<<<< HEAD
                         <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax224:ServiceGroup"></xs:element>
 =======
                         <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax225:ServiceGroup"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                        <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax224:ServiceGroup"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
@@ -1001,10 +1439,14 @@
                 <xs:complexType>
                     <xs:sequence>
 <<<<<<< HEAD
+<<<<<<< HEAD
                         <xs:element minOccurs="0" name="return" nillable="true" type="ax224:ServiceGroup"></xs:element>
 =======
                         <xs:element minOccurs="0" name="return" nillable="true" type="ax225:ServiceGroup"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                        <xs:element minOccurs="0" name="return" nillable="true" type="ax224:ServiceGroup"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
@@ -1012,10 +1454,14 @@
                 <xs:complexType>
                     <xs:sequence>
 <<<<<<< HEAD
+<<<<<<< HEAD
                         <xs:element minOccurs="0" name="registrant" nillable="true" type="ax224:Registrant"></xs:element>
 =======
                         <xs:element minOccurs="0" name="registrant" nillable="true" type="ax225:Registrant"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                        <xs:element minOccurs="0" name="registrant" nillable="true" type="ax224:Registrant"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
@@ -1042,10 +1488,14 @@
             <xs:complexType name="Properties">
                 <xs:sequence>
 <<<<<<< HEAD
+<<<<<<< HEAD
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax226:Property"></xs:element>
 =======
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax229:Property"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax226:Property"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="Property">
@@ -1057,6 +1507,7 @@
         </xs:schema>
         <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://exception.controller.cloud.stratos.apache.org/xsd">
 <<<<<<< HEAD
+<<<<<<< HEAD
             <xs:complexType name="DeploymentPolicyNotExistsException">
                 <xs:sequence></xs:sequence>
             </xs:complexType>
@@ -1079,6 +1530,34 @@
 =======
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
             <xs:complexType name="CartridgeDefinitionNotExistsException">
+=======
+            <xs:complexType name="DeploymentPolicyNotExistsException">
+                <xs:sequence></xs:sequence>
+            </xs:complexType>
+            <xs:complexType name="InvalidCartridgeDefinitionException">
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
+                <xs:sequence>
+                    <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
+                </xs:sequence>
+            </xs:complexType>
+<<<<<<< HEAD
+            <xs:complexType name="InvalidCartridgeTypeException">
+=======
+            <xs:complexType name="InvalidIaasProviderException">
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
+                <xs:sequence>
+                    <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
+                </xs:sequence>
+            </xs:complexType>
+<<<<<<< HEAD
+            <xs:complexType name="NetworkPartitionAlreadyExistsException">
+                <xs:sequence></xs:sequence>
+            </xs:complexType>
+            <xs:complexType name="NetworkPartitionNotExistsException">
+                <xs:sequence></xs:sequence>
+            </xs:complexType>
+=======
+            <xs:complexType name="CartridgeDefinitionNotExistsException">
                 <xs:sequence>
                     <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
                 </xs:sequence>
@@ -1094,6 +1573,7 @@
             <xs:complexType name="NetworkPartitionNotExistsException">
                 <xs:sequence></xs:sequence>
             </xs:complexType>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
             <xs:complexType name="InvalidKubernetesHostException">
                 <xs:sequence>
                     <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
@@ -1120,11 +1600,17 @@
                 </xs:sequence>
             </xs:complexType>
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
             <xs:complexType name="CartridgeAlreadyExistsException">
                 <xs:sequence></xs:sequence>
             </xs:complexType>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+            <xs:complexType name="CartridgeAlreadyExistsException">
+                <xs:sequence></xs:sequence>
+            </xs:complexType>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
             <xs:complexType name="InvalidKubernetesClusterException">
                 <xs:sequence>
                     <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
@@ -1174,6 +1660,7 @@
                 <xs:sequence></xs:sequence>
             </xs:complexType>
 <<<<<<< HEAD
+<<<<<<< HEAD
             <xs:complexType name="InvalidMemberException">
 =======
             <xs:complexType name="DeploymentPolicyNotExistsException">
@@ -1181,6 +1668,9 @@
             </xs:complexType>
             <xs:complexType name="UnregisteredClusterException">
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+            <xs:complexType name="InvalidMemberException">
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                 <xs:sequence>
                     <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
                 </xs:sequence>
@@ -1228,19 +1718,27 @@
             </xs:complexType>
         </xs:schema>
 <<<<<<< HEAD
+<<<<<<< HEAD
         <xs:schema xmlns:ax227="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://domain.controller.cloud.stratos.apache.org/xsd">
 =======
         <xs:schema xmlns:ax230="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://domain.controller.cloud.stratos.apache.org/xsd">
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+        <xs:schema xmlns:ax227="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://domain.controller.cloud.stratos.apache.org/xsd">
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
             <xs:import namespace="http://common.stratos.apache.org/xsd"></xs:import>
             <xs:complexType name="DeploymentPolicy">
                 <xs:sequence>
                     <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"></xs:element>
 <<<<<<< HEAD
+<<<<<<< HEAD
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionsRef" nillable="true" type="ax224:NetworkPartitionRef"></xs:element>
 =======
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionsRef" nillable="true" type="ax225:NetworkPartitionRef"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionsRef" nillable="true" type="ax224:NetworkPartitionRef"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="NetworkPartitionRef">
@@ -1248,10 +1746,14 @@
                     <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"></xs:element>
                     <xs:element minOccurs="0" name="partitionAlgo" nillable="true" type="xs:string"></xs:element>
 <<<<<<< HEAD
+<<<<<<< HEAD
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax224:PartitionRef"></xs:element>
 =======
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax225:PartitionRef"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax224:PartitionRef"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="PartitionRef">
@@ -1273,6 +1775,7 @@
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="exportingProperties" nillable="true" type="xs:string"></xs:element>
                     <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"></xs:element>
 <<<<<<< HEAD
+<<<<<<< HEAD
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="iaasConfigs" nillable="true" type="ax224:IaasConfig"></xs:element>
                     <xs:element minOccurs="0" name="isPublic" type="xs:boolean"></xs:element>
                     <xs:element minOccurs="0" name="lbConfig" nillable="true" type="ax224:LoadbalancerConfig"></xs:element>
@@ -1291,6 +1794,16 @@
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax225:PortMapping"></xs:element>
                     <xs:element minOccurs="0" name="properties" nillable="true" type="ax230:Properties"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="iaasConfigs" nillable="true" type="ax224:IaasConfig"></xs:element>
+                    <xs:element minOccurs="0" name="isPublic" type="xs:boolean"></xs:element>
+                    <xs:element minOccurs="0" name="lbConfig" nillable="true" type="ax224:LoadbalancerConfig"></xs:element>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="metadataKeys" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="multiTenant" type="xs:boolean"></xs:element>
+                    <xs:element minOccurs="0" name="persistence" nillable="true" type="ax224:Persistence"></xs:element>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax224:PortMapping"></xs:element>
+                    <xs:element minOccurs="0" name="properties" nillable="true" type="ax226:Properties"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"></xs:element>
                     <xs:element minOccurs="0" name="serviceGroup" nillable="true" type="xs:string"></xs:element>
                     <xs:element minOccurs="0" name="tenantPartitions" nillable="true" type="xs:string"></xs:element>
@@ -1306,6 +1819,7 @@
                     <xs:element minOccurs="0" name="imageId" nillable="true" type="xs:string"></xs:element>
                     <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element>
 <<<<<<< HEAD
+<<<<<<< HEAD
                     <xs:element minOccurs="0" name="networkInterfaces" nillable="true" type="ax224:NetworkInterfaces"></xs:element>
                     <xs:element minOccurs="0" name="payload" nillable="true" type="xs:base64Binary"></xs:element>
                     <xs:element minOccurs="0" name="properties" nillable="true" type="ax226:Properties"></xs:element>
@@ -1314,6 +1828,11 @@
                     <xs:element minOccurs="0" name="payload" nillable="true" type="xs:base64Binary"></xs:element>
                     <xs:element minOccurs="0" name="properties" nillable="true" type="ax230:Properties"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                    <xs:element minOccurs="0" name="networkInterfaces" nillable="true" type="ax224:NetworkInterfaces"></xs:element>
+                    <xs:element minOccurs="0" name="payload" nillable="true" type="xs:base64Binary"></xs:element>
+                    <xs:element minOccurs="0" name="properties" nillable="true" type="ax226:Properties"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"></xs:element>
                     <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"></xs:element>
                 </xs:sequence>
@@ -1321,20 +1840,28 @@
             <xs:complexType name="NetworkInterfaces">
                 <xs:sequence>
 <<<<<<< HEAD
+<<<<<<< HEAD
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="networkInterfaces" nillable="true" type="ax224:NetworkInterface"></xs:element>
 =======
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="networkInterfaces" nillable="true" type="ax225:NetworkInterface"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="networkInterfaces" nillable="true" type="ax224:NetworkInterface"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="NetworkInterface">
                 <xs:sequence>
                     <xs:element minOccurs="0" name="fixedIp" nillable="true" type="xs:string"></xs:element>
 <<<<<<< HEAD
+<<<<<<< HEAD
                     <xs:element minOccurs="0" name="floatingNetworks" nillable="true" type="ax224:FloatingNetworks"></xs:element>
 =======
                     <xs:element minOccurs="0" name="floatingNetworks" nillable="true" type="ax225:FloatingNetworks"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                    <xs:element minOccurs="0" name="floatingNetworks" nillable="true" type="ax224:FloatingNetworks"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     <xs:element minOccurs="0" name="networkUuid" nillable="true" type="xs:string"></xs:element>
                     <xs:element minOccurs="0" name="portUuid" nillable="true" type="xs:string"></xs:element>
                 </xs:sequence>
@@ -1342,10 +1869,14 @@
             <xs:complexType name="FloatingNetworks">
                 <xs:sequence>
 <<<<<<< HEAD
+<<<<<<< HEAD
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="floatingNetworks" nillable="true" type="ax224:FloatingNetwork"></xs:element>
 =======
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="floatingNetworks" nillable="true" type="ax225:FloatingNetwork"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="floatingNetworks" nillable="true" type="ax224:FloatingNetwork"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="FloatingNetwork">
@@ -1358,10 +1889,14 @@
             <xs:complexType name="LoadbalancerConfig">
                 <xs:sequence>
 <<<<<<< HEAD
+<<<<<<< HEAD
                     <xs:element minOccurs="0" name="properties" nillable="true" type="ax226:Properties"></xs:element>
 =======
                     <xs:element minOccurs="0" name="properties" nillable="true" type="ax230:Properties"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                    <xs:element minOccurs="0" name="properties" nillable="true" type="ax226:Properties"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"></xs:element>
                 </xs:sequence>
             </xs:complexType>
@@ -1369,10 +1904,14 @@
                 <xs:sequence>
                     <xs:element minOccurs="0" name="persistanceRequired" type="xs:boolean"></xs:element>
 <<<<<<< HEAD
+<<<<<<< HEAD
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax224:Volume"></xs:element>
 =======
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax225:Volume"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax224:Volume"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="Volume">
@@ -1402,10 +1941,14 @@
                     <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"></xs:element>
                     <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"></xs:element>
 <<<<<<< HEAD
+<<<<<<< HEAD
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax224:Partition"></xs:element>
 =======
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax225:Partition"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax224:Partition"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="Partition">
@@ -1415,10 +1958,14 @@
                     <xs:element minOccurs="0" name="isPublic" type="xs:boolean"></xs:element>
                     <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"></xs:element>
 <<<<<<< HEAD
+<<<<<<< HEAD
                     <xs:element minOccurs="0" name="properties" nillable="true" type="ax226:Properties"></xs:element>
 =======
                     <xs:element minOccurs="0" name="properties" nillable="true" type="ax230:Properties"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                    <xs:element minOccurs="0" name="properties" nillable="true" type="ax226:Properties"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"></xs:element>
                 </xs:sequence>
             </xs:complexType>
@@ -1437,12 +1984,17 @@
                     <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"></xs:element>
                     <xs:element minOccurs="0" name="obsoleteExpiryTime" type="xs:long"></xs:element>
 <<<<<<< HEAD
+<<<<<<< HEAD
                     <xs:element minOccurs="0" name="partition" nillable="true" type="ax224:Partition"></xs:element>
                     <xs:element minOccurs="0" name="properties" nillable="true" type="ax226:Properties"></xs:element>
 =======
                     <xs:element minOccurs="0" name="partition" nillable="true" type="ax225:Partition"></xs:element>
                     <xs:element minOccurs="0" name="properties" nillable="true" type="ax230:Properties"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                    <xs:element minOccurs="0" name="partition" nillable="true" type="ax224:Partition"></xs:element>
+                    <xs:element minOccurs="0" name="properties" nillable="true" type="ax226:Properties"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="MemberContext">
@@ -1458,16 +2010,21 @@
                     <xs:element minOccurs="0" name="initTime" type="xs:long"></xs:element>
                     <xs:element minOccurs="0" name="instanceId" nillable="true" type="xs:string"></xs:element>
 <<<<<<< HEAD
+<<<<<<< HEAD
                     <xs:element minOccurs="0" name="instanceMetadata" nillable="true" type="ax224:InstanceMetadata"></xs:element>
 =======
                     <xs:element minOccurs="0" name="instanceMetadata" nillable="true" type="ax225:InstanceMetadata"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                    <xs:element minOccurs="0" name="instanceMetadata" nillable="true" type="ax224:InstanceMetadata"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     <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="obsoleteExpiryTime" type="xs:long"></xs:element>
                     <xs:element minOccurs="0" name="obsoleteInitTime" type="xs:long"></xs:element>
 <<<<<<< HEAD
+<<<<<<< HEAD
                     <xs:element minOccurs="0" name="partition" nillable="true" type="ax224:Partition"></xs:element>
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="privateIPs" nillable="true" type="xs:string"></xs:element>
                     <xs:element minOccurs="0" name="properties" nillable="true" type="ax226:Properties"></xs:element>
@@ -1476,6 +2033,11 @@
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="privateIPs" nillable="true" type="xs:string"></xs:element>
                     <xs:element minOccurs="0" name="properties" nillable="true" type="ax230:Properties"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                    <xs:element minOccurs="0" name="partition" nillable="true" type="ax224:Partition"></xs:element>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="privateIPs" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="properties" nillable="true" type="ax226:Properties"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="publicIPs" nillable="true" type="xs:string"></xs:element>
                 </xs:sequence>
             </xs:complexType>
@@ -1495,10 +2057,14 @@
             <xs:complexType name="CartridgeInfo">
                 <xs:sequence>
 <<<<<<< HEAD
+<<<<<<< HEAD
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="appTypes" nillable="true" type="ax224:AppType"></xs:element>
 =======
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="appTypes" nillable="true" type="ax225:AppType"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="appTypes" nillable="true" type="ax224:AppType"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     <xs:element minOccurs="0" name="baseDir" nillable="true" type="xs:string"></xs:element>
                     <xs:element minOccurs="0" name="category" nillable="true" type="xs:string"></xs:element>
                     <xs:element minOccurs="0" name="defaultAutoscalingPolicy" nillable="true" type="xs:string"></xs:element>
@@ -1509,12 +2075,16 @@
                     <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"></xs:element>
                     <xs:element minOccurs="0" name="isPublic" type="xs:boolean"></xs:element>
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     <xs:element minOccurs="0" name="lbConfig" nillable="true" type="ax224:LoadbalancerConfig"></xs:element>
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="metadataKeys" nillable="true" type="xs:string"></xs:element>
                     <xs:element minOccurs="0" name="multiTenant" type="xs:boolean"></xs:element>
                     <xs:element minOccurs="0" name="persistence" nillable="true" type="ax224:Persistence"></xs:element>
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax224:PortMapping"></xs:element>
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax226:Property"></xs:element>
+<<<<<<< HEAD
 =======
                     <xs:element minOccurs="0" name="lbConfig" nillable="true" type="ax225:LoadbalancerConfig"></xs:element>
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="metadataKeys" nillable="true" type="xs:string"></xs:element>
@@ -1523,6 +2093,8 @@
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax225:PortMapping"></xs:element>
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax230:Property"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"></xs:element>
                     <xs:element minOccurs="0" name="serviceGroup" nillable="true" type="xs:string"></xs:element>
                     <xs:element minOccurs="0" name="tenantPartitions" nillable="true" type="xs:string"></xs:element>
@@ -1547,16 +2119,22 @@
                     <xs:element minOccurs="0" name="lbCluster" type="xs:boolean"></xs:element>
                     <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"></xs:element>
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     <xs:element minOccurs="0" name="properties" nillable="true" type="ax226:Properties"></xs:element>
                     <xs:element minOccurs="0" name="timeoutInMillis" type="xs:long"></xs:element>
                     <xs:element minOccurs="0" name="volumeRequired" type="xs:boolean"></xs:element>
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax224:Volume"></xs:element>
+<<<<<<< HEAD
 =======
                     <xs:element minOccurs="0" name="properties" nillable="true" type="ax230:Properties"></xs:element>
                     <xs:element minOccurs="0" name="timeoutInMillis" type="xs:long"></xs:element>
                     <xs:element minOccurs="0" name="volumeRequired" type="xs:boolean"></xs:element>
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax225:Volume"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="ApplicationClusterContext">
@@ -1569,10 +2147,14 @@
                     <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"></xs:element>
                     <xs:element minOccurs="0" name="lbCluster" type="xs:boolean"></xs:element>
 <<<<<<< HEAD
+<<<<<<< HEAD
                     <xs:element minOccurs="0" name="properties" nillable="true" type="ax226:Properties"></xs:element>
 =======
                     <xs:element minOccurs="0" name="properties" nillable="true" type="ax230:Properties"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                    <xs:element minOccurs="0" name="properties" nillable="true" type="ax226:Properties"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     <xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"></xs:element>
                     <xs:element minOccurs="0" name="textPayload" nillable="true" type="xs:string"></xs:element>
                 </xs:sequence>
@@ -1581,10 +2163,14 @@
                 <xs:sequence>
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridges" nillable="true" type="xs:string"></xs:element>
 <<<<<<< HEAD
+<<<<<<< HEAD
                     <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax224:Dependencies"></xs:element>
 =======
                     <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax225:Dependencies"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                    <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax224:Dependencies"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element>
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="subGroups" nillable="true" type="xs:string"></xs:element>
                 </xs:sequence>
@@ -1598,12 +2184,17 @@
                     <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"></xs:element>
                     <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"></xs:element>
 <<<<<<< HEAD
+<<<<<<< HEAD
                     <xs:element minOccurs="0" name="persistence" nillable="true" type="ax224:Persistence"></xs:element>
                     <xs:element minOccurs="0" name="properties" nillable="true" type="ax226:Properties"></xs:element>
 =======
                     <xs:element minOccurs="0" name="persistence" nillable="true" type="ax225:Persistence"></xs:element>
                     <xs:element minOccurs="0" name="properties" nillable="true" type="ax230:Properties"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                    <xs:element minOccurs="0" name="persistence" nillable="true" type="ax224:Persistence"></xs:element>
+                    <xs:element minOccurs="0" name="properties" nillable="true" type="ax226:Properties"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     <xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"></xs:element>
                 </xs:sequence>
             </xs:complexType>