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/27 15:46:38 UTC

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

http://git-wip-us.apache.org/repos/asf/stratos/blob/8cf2f9f7/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl b/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
index 63f9d4e..a871469 100644
--- a/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
+++ b/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
@@ -27,7 +27,6 @@ import org.apache.stratos.autoscaler.util.AutoscalerConstants;
 import org.apache.stratos.autoscaler.context.partition.network.ClusterLevelNetworkPartitionContext;
 import org.apache.stratos.autoscaler.pojo.policy.PolicyManager;
 import org.apache.stratos.autoscaler.pojo.policy.autoscale.AutoscalePolicy;
-import org.apache.stratos.autoscaler.pojo.policy.deployment.DeploymentPolicy;
 import org.apache.stratos.autoscaler.pojo.policy.autoscale.RequestsInFlight;
 import org.apache.stratos.autoscaler.pojo.policy.autoscale.LoadThresholds;
 import org.apache.stratos.autoscaler.pojo.policy.autoscale.MemoryConsumption;

http://git-wip-us.apache.org/repos/asf/stratos/blob/8cf2f9f7/samples/applications/single-cartridge/artifacts/application.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/artifacts/application.json b/samples/applications/single-cartridge/artifacts/application.json
index 8c2c09a..6ef0c02 100644
--- a/samples/applications/single-cartridge/artifacts/application.json
+++ b/samples/applications/single-cartridge/artifacts/application.json
@@ -5,12 +5,12 @@
    "components":{  
       "cartridges":[  
          {  
-            "type":"php",
+                "type":"php",
                 "cartridgeMin": 1,
                 "cartridgeMax": 10,    
 				"subscribableInfo":{  
                	"alias":"php1",
-               	"autoscalingPolicy":"autoscale-policy-1",
+               	"autoscalingPolicy":"autoscaling-policy-1",
                 "deploymentPolicy":"deployment-policy-1",
                 "artifactRepository":{
                    "privateRepo":false,

http://git-wip-us.apache.org/repos/asf/stratos/blob/8cf2f9f7/samples/applications/single-cartridge/artifacts/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/artifacts/deployment-policy.json b/samples/applications/single-cartridge/artifacts/deployment-policy.json
index d858aed..666c299 100644
--- a/samples/applications/single-cartridge/artifacts/deployment-policy.json
+++ b/samples/applications/single-cartridge/artifacts/deployment-policy.json
@@ -1,5 +1,5 @@
 {
-   "id": "deployment-policy-2",
+   "id": "deployment-policy-1",
    "networkPartition": [
       {
          "id": "network-partition-1",

http://git-wip-us.apache.org/repos/asf/stratos/blob/8cf2f9f7/samples/applications/single-cartridge/artifacts/network-partition.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/artifacts/network-partition.json b/samples/applications/single-cartridge/artifacts/network-partition.json
index c0d7d07..2a5b7ec 100644
--- a/samples/applications/single-cartridge/artifacts/network-partition.json
+++ b/samples/applications/single-cartridge/artifacts/network-partition.json
@@ -2,7 +2,7 @@
     "id": "network-partition-1",
     "partitions": [
         {
-            "id": "p1",
+            "id": "partition-1",
             "provider": "mock",
             "property": [
                 {

http://git-wip-us.apache.org/repos/asf/stratos/blob/8cf2f9f7/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoscalerService.wsdl
----------------------------------------------------------------------
diff --git 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
index 8d40a57..1e6ffb9 100644
--- 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,13 +1,19 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <?xml version="1.0" encoding="UTF-8"?><wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ax29="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ns="http://impl.services.autoscaler.stratos.apache.org" xmlns:ax27="http://pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax25="http://application.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax217="http://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:ax219="http://policy.exception.autoscaler.stratos.apache.org/xsd" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ax212="http://network.partition.deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax222="http://kubernetes.exception.autoscaler.stratos.apache.org/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" x
 mlns:ax211="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" 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">
 =======
 =======
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
 <wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ax29="http://pojo.applications.autoscaler.stratos.apache.org/xsd" xmlns:ns="http://impl.services.autoscaler.stratos.apache.org" xmlns:ax27="http://application.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax25="http://policy.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax23="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ax218="http://kubernetes.exception.autoscaler.stratos.apache.org/xsd" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ax220="http://pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax215="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ax213="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax210="http://common.stratos.apache.org/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" 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.autoscaler.stratos.apache.org">
 =======
 <wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ax29="http://pojo.applications.autoscaler.stratos.apache.org/xsd" xmlns:ns="http://impl.services.autoscaler.stratos.apache.org" xmlns:ax27="http://application.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax25="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax23="http://policy.exception.autoscaler.stratos.apache.org/xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ax218="http://network.partition.deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax215="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ax221="http://kubernetes.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax213="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax223="http://pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax210="http://common.stratos.apache.org/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:http=
 "http://schemas.xmlsoap.org/wsdl/http/" 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.autoscaler.stratos.apache.org">
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns="http://impl.services.autoscaler.stratos.apache.org" xmlns:ax27="http://pojo.applications.autoscaler.stratos.apache.org/xsd" xmlns:ax28="http://common.stratos.apache.org/xsd" xmlns:ax25="http://application.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax23="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ax218="http://kubernetes.exception.autoscaler.stratos.apache.org/xsd" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ax220="http://pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax215="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ax213="http://policy.exception.autoscaler.stratos.apache.org/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:ax211="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" 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.autoscaler.stratos.apache.org">
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
     <wsdl:documentation>AutoscalerService</wsdl:documentation>
 >>>>>>> Adding back missing commit 954488432a60f6e80a34a8b5d3f868568d4f8a0c on application policy deployment
     <wsdl:types>
@@ -41,17 +47,17 @@
                 </xs:sequence>
             </xs:complexType>
         </xs:schema>
-        <xs:schema xmlns:ax211="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd">
+        <xs:schema xmlns:ax29="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd">
             <xs:import namespace="http://common.stratos.apache.org/xsd"></xs:import>
             <xs:complexType name="ApplicationContext">
                 <xs:sequence>
                     <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"></xs:element>
                     <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"></xs:element>
-                    <xs:element minOccurs="0" name="components" nillable="true" type="ax29:ComponentContext"></xs:element>
+                    <xs:element minOccurs="0" name="components" nillable="true" type="ax27:ComponentContext"></xs:element>
                     <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"></xs:element>
                     <xs:element minOccurs="0" name="multiTenant" type="xs:boolean"></xs:element>
                     <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element>
-                    <xs:element minOccurs="0" name="properties" nillable="true" type="ax210:Properties"></xs:element>
+                    <xs:element minOccurs="0" name="properties" nillable="true" type="ax29:Properties"></xs:element>
                     <xs:element minOccurs="0" name="status" nillable="true" type="xs:string"></xs:element>
                     <xs:element minOccurs="0" name="tenantAdminUsername" nillable="true" type="xs:string"></xs:element>
                     <xs:element minOccurs="0" name="tenantDomain" nillable="true" type="xs:string"></xs:element>
@@ -60,10 +66,10 @@
             </xs:complexType>
             <xs:complexType name="ComponentContext">
                 <xs:sequence>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" name="applicationClusterContexts" nillable="true" type="ax29:ApplicationClusterContext"></xs:element>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax29:CartridgeContext"></xs:element>
-                    <xs:element minOccurs="0" name="dependencyContext" nillable="true" type="ax29:DependencyContext"></xs:element>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax29:GroupContext"></xs:element>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="applicationClusterContexts" nillable="true" type="ax27:ApplicationClusterContext"></xs:element>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax27:CartridgeContext"></xs:element>
+                    <xs:element minOccurs="0" name="dependencyContext" nillable="true" type="ax27:DependencyContext"></xs:element>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax27:GroupContext"></xs:element>
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="ApplicationClusterContext">
@@ -75,7 +81,7 @@
                     <xs:element minOccurs="0" name="deploymentPolicyName" nillable="true" type="xs:string"></xs:element>
                     <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"></xs:element>
                     <xs:element minOccurs="0" name="lbCluster" type="xs:boolean"></xs:element>
-                    <xs:element minOccurs="0" name="properties" nillable="true" type="ax210:Properties"></xs:element>
+                    <xs:element minOccurs="0" name="properties" nillable="true" type="ax29:Properties"></xs:element>
                     <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>
@@ -84,20 +90,20 @@
                 <xs:sequence>
                     <xs:element minOccurs="0" name="cartridgeMax" type="xs:int"></xs:element>
                     <xs:element minOccurs="0" name="cartridgeMin" type="xs:int"></xs:element>
-                    <xs:element minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax29:SubscribableInfoContext"></xs:element>
+                    <xs:element minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax27:SubscribableInfoContext"></xs:element>
                     <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"></xs:element>
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="SubscribableInfoContext">
                 <xs:sequence>
                     <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"></xs:element>
-                    <xs:element minOccurs="0" name="artifactRepositoryContext" nillable="true" type="ax29:ArtifactRepositoryContext"></xs:element>
+                    <xs:element minOccurs="0" name="artifactRepositoryContext" nillable="true" type="ax27:ArtifactRepositoryContext"></xs:element>
                     <xs:element minOccurs="0" name="autoscalingPolicy" nillable="true" type="xs:string"></xs:element>
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="dependencyAliases" nillable="true" type="xs:string"></xs:element>
                     <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="xs:string"></xs:element>
                     <xs:element minOccurs="0" name="maxMembers" type="xs:int"></xs:element>
                     <xs:element minOccurs="0" name="minMembers" type="xs:int"></xs:element>
-                    <xs:element minOccurs="0" name="properties" nillable="true" type="ax210:Properties"></xs:element>
+                    <xs:element minOccurs="0" name="properties" nillable="true" type="ax29:Properties"></xs:element>
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="ArtifactRepositoryContext">
@@ -119,9 +125,9 @@
             <xs:complexType name="GroupContext">
                 <xs:sequence>
                     <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"></xs:element>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax29:CartridgeContext"></xs:element>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax27:CartridgeContext"></xs:element>
                     <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="xs:string"></xs:element>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax29:GroupContext"></xs:element>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax27:GroupContext"></xs:element>
                     <xs:element minOccurs="0" name="groupMaxInstances" type="xs:int"></xs:element>
                     <xs:element minOccurs="0" name="groupMinInstances" type="xs:int"></xs:element>
                     <xs:element minOccurs="0" name="groupScalingEnabled" type="xs:boolean"></xs:element>
@@ -141,12 +147,17 @@
 =======
                     <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="ax220:Dependencies"></xs:element>
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="groups" nillable="true" type="ax220:ServiceGroup"></xs:element>
 =======
                     <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax223:Dependencies"></xs:element>
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="groups" nillable="true" type="ax223:ServiceGroup"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                    <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax220:Dependencies"></xs:element>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="groups" nillable="true" type="ax220:ServiceGroup"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     <xs:element minOccurs="0" name="groupscalingEnabled" type="xs:boolean"></xs:element>
                     <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element>
 >>>>>>> Adding back missing commit 954488432a60f6e80a34a8b5d3f868568d4f8a0c on application policy deployment
@@ -162,6 +173,7 @@
         </xs:schema>
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
         <xs:schema xmlns:ax28="http://pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax26="http://application.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax24="http://pojo.applications.autoscaler.stratos.apache.org/xsd" xmlns:ax216="http://network.partition.deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax218="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ax215="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax220="http://policy.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax221="http://common.stratos.apache.org/xsd" xmlns:ax223="http://kubernetes.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax210="http://autoscale.policy.pojo.autoscaler.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"/>
@@ -217,6 +229,8 @@
 =======
 =======
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
         <xs:schema xmlns:ax214="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax221="http://pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax212="http://pojo.applications.autoscaler.stratos.apache.org/xsd" xmlns:ax28="http://application.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax26="http://policy.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax24="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax217="http://common.stratos.apache.org/xsd" xmlns:ax216="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ax219="http://kubernetes.exception.autoscaler.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.autoscaler.stratos.apache.org">
             <xs:import namespace="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"></xs:import>
 =======
@@ -224,14 +238,22 @@
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
             <xs:import namespace="http://policy.exception.autoscaler.stratos.apache.org/xsd"></xs:import>
             <xs:import namespace="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"></xs:import>
+=======
+        <xs:schema xmlns:ax214="http://policy.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax212="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax221="http://pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax210="http://pojo.applications.autoscaler.stratos.apache.org/xsd" xmlns:ax26="http://application.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax24="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax217="http://common.stratos.apache.org/xsd" xmlns:ax216="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ax219="http://kubernetes.exception.autoscaler.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.autoscaler.stratos.apache.org">
+            <xs:import namespace="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"></xs:import>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
             <xs:import namespace="http://application.exception.autoscaler.stratos.apache.org/xsd"></xs:import>
             <xs:import namespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd"></xs:import>
             <xs:import namespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"></xs:import>
+            <xs:import namespace="http://policy.exception.autoscaler.stratos.apache.org/xsd"></xs:import>
             <xs:import namespace="http://exception.autoscaler.stratos.apache.org/xsd"></xs:import>
             <xs:import namespace="http://common.stratos.apache.org/xsd"></xs:import>
             <xs:import namespace="http://kubernetes.exception.autoscaler.stratos.apache.org/xsd"></xs:import>
             <xs:import namespace="http://pojo.autoscaler.stratos.apache.org/xsd"></xs:import>
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
             <xs:element name="getAutoScalingPolicies">
 >>>>>>> Adding back missing commit 954488432a60f6e80a34a8b5d3f868568d4f8a0c on application policy deployment
                 <xs:complexType>
@@ -249,38 +271,57 @@
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
+<<<<<<< HEAD
 =======
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
             <xs:element name="AutoscalerServiceInvalidPolicyException">
                 <xs:complexType>
                     <xs:sequence>
                         <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax23:InvalidPolicyException"></xs:element>
+=======
+            <xs:element name="AutoscalerServiceApplicationDefinitionException">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax25:ApplicationDefinitionException"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="addAutoScalingPolicy">
+            <xs:element name="addApplication">
                 <xs:complexType>
                     <xs:sequence>
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
                         <xs:element minOccurs="0" name="return" nillable="true" type="ax215:DeploymentPolicy"/>
 =======
                         <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax23:AutoscalePolicy"></xs:element>
 =======
                         <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax25:AutoscalePolicy"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                        <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax25:AutoscalePolicy"></xs:element>
+=======
+                        <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax27:ApplicationContext"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="addAutoScalingPolicyResponse">
+            <xs:element name="getApplications">
                 <xs:complexType>
+<<<<<<< HEAD
                     <xs:sequence>
                         <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
 >>>>>>> Adding back missing commit 954488432a60f6e80a34a8b5d3f868568d4f8a0c on application policy deployment
                     </xs:sequence>
+=======
+                    <xs:sequence></xs:sequence>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                 </xs:complexType>
             </xs:element>
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
             <xs:element name="getAutoScalingPolicies">
                 <xs:complexType>
@@ -296,60 +337,107 @@
             </xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
             <xs:element name="AutoscalerServiceApplicationDefinitionException">
+=======
+            <xs:element name="getApplicationsResponse">
                 <xs:complexType>
                     <xs:sequence>
 <<<<<<< HEAD
+<<<<<<< HEAD
                         <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax216:NetworkPartition"/>
 =======
                         <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax27:ApplicationDefinitionException"></xs:element>
 >>>>>>> Adding back missing commit 954488432a60f6e80a34a8b5d3f868568d4f8a0c on application policy deployment
+=======
+                        <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax27:ApplicationContext"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="addApplication">
+            <xs:element name="deployApplication">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax29:ApplicationContext"></xs:element>
+                        <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"></xs:element>
+                        <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax212:ApplicationPolicy"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getApplications">
+            <xs:element name="deployApplicationResponse">
                 <xs:complexType>
 <<<<<<< HEAD
+<<<<<<< HEAD
                     <xs:sequence>
                         <xs:element minOccurs="0" name="return" nillable="true" type="ax216:NetworkPartition"/>
                     </xs:sequence>
 =======
                     <xs:sequence></xs:sequence>
 >>>>>>> Adding back missing commit 954488432a60f6e80a34a8b5d3f868568d4f8a0c on application policy deployment
+=======
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
+                    </xs:sequence>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getApplicationsResponse">
+            <xs:element name="undeployApplication">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax29:ApplicationContext"></xs:element>
+                        <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="deployApplication">
+            <xs:element name="getAutoscalingPolicy">
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                 <xs:complexType>
                     <xs:sequence>
 <<<<<<< HEAD
+<<<<<<< HEAD
                         <xs:element minOccurs="0" name="networkPartition" nillable="true" type="ax216:NetworkPartition"/>
 =======
                         <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"></xs:element>
                         <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax214:ApplicationPolicy"></xs:element>
 >>>>>>> Adding back missing commit 954488432a60f6e80a34a8b5d3f868568d4f8a0c on application policy deployment
+=======
+                        <xs:element minOccurs="0" name="autoscalingPolicyId" nillable="true" type="xs:string"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="deployApplicationResponse">
+            <xs:element name="getAutoscalingPolicyResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return" nillable="true" type="ax23:AutoscalePolicy"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="AutoscalerServiceInvalidPolicyException">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax214:InvalidPolicyException"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="addAutoScalingPolicy">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax23:AutoscalePolicy"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="addAutoScalingPolicyResponse">
                 <xs:complexType>
                     <xs:sequence>
                         <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
+            <xs:element name="updateAutoScalingPolicy">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax23:AutoscalePolicy"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+<<<<<<< HEAD
             <xs:element name="getApplicationPolicy">
                 <xs:complexType>
                     <xs:sequence>
@@ -365,33 +453,43 @@
                 </xs:complexType>
             </xs:element>
             <xs:element name="undeployApplication">
+=======
+            <xs:element name="updateAutoScalingPolicyResponse">
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"></xs:element>
+                        <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getAutoscalingPolicy">
+            <xs:element name="removeAutoScalingPolicy">
                 <xs:complexType>
                     <xs:sequence>
 <<<<<<< HEAD
+<<<<<<< HEAD
                         <xs:element minOccurs="0" name="AutoScalerException" nillable="true" type="ax217:AutoScalerException"/>
 =======
                         <xs:element minOccurs="0" name="autoscalingPolicyId" nillable="true" type="xs:string"></xs:element>
 >>>>>>> Adding back missing commit 954488432a60f6e80a34a8b5d3f868568d4f8a0c on application policy deployment
+=======
+                        <xs:element minOccurs="0" name="autoscalePolicyId" nillable="true" type="xs:string"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getAutoscalingPolicyResponse">
+            <xs:element name="removeAutoScalingPolicyResponse">
                 <xs:complexType>
                     <xs:sequence>
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
                         <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax27:ServiceGroup"/>
 =======
                         <xs:element minOccurs="0" name="return" nillable="true" type="ax23:AutoscalePolicy"></xs:element>
 >>>>>>> Adding back missing commit 954488432a60f6e80a34a8b5d3f868568d4f8a0c on application policy deployment
 =======
+=======
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                         <xs:element minOccurs="0" name="return" nillable="true" type="ax25:AutoscalePolicy"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
@@ -457,6 +555,8 @@
             <xs:element name="removeAutoScalingPolicyResponse">
                 <xs:complexType>
                     <xs:sequence>
+=======
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                         <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
@@ -479,8 +579,12 @@
                         <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax29:AutoscalePolicy"/>
 =======
                         <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element>
+<<<<<<< HEAD
                         <xs:element minOccurs="0" name="properties" nillable="true" type="ax217:Properties"></xs:element>
 >>>>>>> Adding back missing commit 954488432a60f6e80a34a8b5d3f868568d4f8a0c on application policy deployment
+=======
+                        <xs:element minOccurs="0" name="properties" nillable="true" type="ax28:Properties"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
@@ -527,6 +631,7 @@
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
+<<<<<<< HEAD
             <xs:element name="getApplicationPolicyResponse">
                 <xs:complexType>
                     <xs:sequence>
@@ -541,6 +646,8 @@
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
+=======
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
             <xs:element name="getApplication">
                 <xs:complexType>
                     <xs:sequence>
@@ -555,7 +662,7 @@
             <xs:element name="getApplicationResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true" type="ax29:ApplicationContext"></xs:element>
+                        <xs:element minOccurs="0" name="return" nillable="true" type="ax27:ApplicationContext"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
@@ -563,10 +670,14 @@
                 <xs:complexType>
                     <xs:sequence>
 <<<<<<< HEAD
+<<<<<<< HEAD
                         <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax219:InvalidServiceGroupException"></xs:element>
 =======
                         <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax221:InvalidServiceGroupException"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                        <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax219:InvalidServiceGroupException"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
@@ -575,6 +686,7 @@
                     <xs:sequence>
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
                         <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax27:ServiceGroup"/>
                     </xs:sequence>
                 </xs:complexType>
@@ -587,11 +699,19 @@
                         <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax220:ServiceGroup"></xs:element>
 >>>>>>> Adding back missing commit 954488432a60f6e80a34a8b5d3f868568d4f8a0c on application policy deployment
 =======
+=======
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                         <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax220:ServiceGroup"></xs:element>
 =======
                         <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax223:ServiceGroup"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+<<<<<<< HEAD
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+=======
+                        <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax220:ServiceGroup"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
@@ -613,10 +733,14 @@
                 <xs:complexType>
                     <xs:sequence>
 <<<<<<< HEAD
+<<<<<<< HEAD
                         <xs:element minOccurs="0" name="return" nillable="true" type="ax220:ServiceGroup"></xs:element>
 =======
                         <xs:element minOccurs="0" name="return" nillable="true" type="ax223:ServiceGroup"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+                        <xs:element minOccurs="0" name="return" nillable="true" type="ax220:ServiceGroup"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
@@ -649,6 +773,7 @@
                 <xs:complexType>
                     <xs:sequence>
 <<<<<<< HEAD
+<<<<<<< HEAD
                         <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax220:ServiceGroup"></xs:element>
 <<<<<<< HEAD
 >>>>>>> Adding back missing commit 954488432a60f6e80a34a8b5d3f868568d4f8a0c on application policy deployment
@@ -656,7 +781,13 @@
 =======
                         <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax223:ServiceGroup"></xs:element>
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+<<<<<<< HEAD
 >>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+=======
+=======
+                        <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax220:ServiceGroup"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
@@ -679,8 +810,15 @@
             <xs:complexType name="ApplicationPolicy">
                 <xs:sequence>
                     <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"></xs:element>
+<<<<<<< HEAD
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionReferences" nillable="true" type="ax213:ApplicationPolicyNetworkPartitionReference"></xs:element>
+<<<<<<< HEAD
 >>>>>>> Adding back missing commit 954488432a60f6e80a34a8b5d3f868568d4f8a0c on application policy deployment
+=======
+=======
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionReferences" nillable="true" type="ax211:ApplicationPolicyNetworkPartitionReference"></xs:element>
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
+>>>>>>> fixing STRATOS-1214 - deployement policy changes
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="ApplicationPolicyNetworkPartitionReference">
@@ -752,7 +890,7 @@
         <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://common.stratos.apache.org/xsd">
             <xs:complexType name="Properties">
                 <xs:sequence>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax210:Property"></xs:element>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax28:Property"></xs:element>
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="Property">