http://git-wip-us.apache.org/repos/asf/stratos/blob/0a25877d/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 036ccb2..4bb8d87 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,20 +1,10 @@
-<<<<<<< HEAD
-<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions 
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; 
xmlns:ax27="http://common.stratos.apache.org/xsd"; 
xmlns:ns="http://impl.services.autoscaler.stratos.apache.org"; 
xmlns:ax25="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax26="http://partition.common.stratos.apache.org/xsd"; 
xmlns:ax23="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax21="http://pojo.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax216="http://exception.autoscaler.stratos.apache.org/xsd"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema"; 
xmlns:ax218="http://policy.exception.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax214="http://application.exception.autoscaler.stratos.apache.org/xsd"; 
xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:ax222="http://rmi.java/xsd"; 
xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; 
xmlns:ax223="http://io.java/xsd"; 
xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; 
xmlns:ax211="http://pojo.applications.au
 toscaler.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";>
+<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions 
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; 
xmlns:ns="http://impl.services.autoscaler.stratos.apache.org"; 
xmlns:ax28="http://application.exception.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax25="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax217="http://policy.exception.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax21="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema"; 
xmlns:ax22="http://common.stratos.apache.org/xsd"; 
xmlns:ax219="http://exception.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax214="http://io.java/xsd"; xmlns:ns1="http://org.apache.axis2/xsd"; 
xmlns:ax221="http://pojo.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax213="http://rmi.java/xsd"; 
xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; 
xmlns:ax210="http://partition.common.stratos.apache.org/xsd"; 
xmlns:ax223="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; 
xmlns:http="http:
 //schemas.xmlsoap.org/wsdl/http/" 
xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"; 
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; 
xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"; 
targetNamespace="http://impl.services.autoscaler.stratos.apache.org";>
     <wsdl:types>
-        <xs:schema xmlns:ax224="http://io.java/xsd"; 
attributeFormDefault="qualified" elementFormDefault="qualified" 
targetNamespace="http://rmi.java/xsd";>
+        <xs:schema xmlns:ax215="http://io.java/xsd"; 
attributeFormDefault="qualified" elementFormDefault="qualified" 
targetNamespace="http://rmi.java/xsd";>
             <xs:import namespace="http://io.java/xsd"/>
             <xs:complexType name="RemoteException">
                 <xs:complexContent>
-                    <xs:extension base="ax223:IOException">
-=======
-<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions 
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; 
xmlns:ns="http://impl.services.autoscaler.stratos.apache.org"; 
xmlns:ax27="http://rmi.java/xsd"; xmlns:ax28="http://io.java/xsd"; 
xmlns:ax23="http://common.stratos.apache.org/xsd"; 
xmlns:ax21="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema"; 
xmlns:ax22="http://partition.common.stratos.apache.org/xsd"; 
xmlns:ax218="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; 
xmlns:ns1="http://org.apache.axis2/xsd"; 
xmlns:ax215="http://application.exception.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax222="http://pojo.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax213="http://exception.autoscaler.stratos.apache.org/xsd"; 
xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; 
xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; 
xmlns:ax211="http://policy.exception.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax224="http://pojo.applications.au
 toscaler.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";>
-    <wsdl:types>
-        <xs:schema xmlns:ax29="http://io.java/xsd"; 
attributeFormDefault="qualified" elementFormDefault="qualified" 
targetNamespace="http://rmi.java/xsd";>
-            <xs:import namespace="http://io.java/xsd"/>
-            <xs:complexType name="RemoteException">
-                <xs:complexContent>
-                    <xs:extension base="ax29:IOException">
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+                    <xs:extension base="ax214:IOException">
                         <xs:sequence>
                             <xs:element minOccurs="0" name="cause" 
nillable="true" type="xs:anyType"/>
                             <xs:element minOccurs="0" name="message" 
nillable="true" type="xs:string"/>
@@ -31,11 +21,7 @@
                     <xs:element minOccurs="0" name="id" nillable="true" 
type="xs:string"/>
                     <xs:element minOccurs="0" name="instanceRoundingFactor" 
type="xs:float"/>
                     <xs:element minOccurs="0" name="isPublic" 
type="xs:boolean"/>
-<<<<<<< HEAD
-                    <xs:element minOccurs="0" name="loadThresholds" 
nillable="true" type="ax23:LoadThresholds"/>
-=======
-                    <xs:element minOccurs="0" name="loadThresholds" 
nillable="true" type="ax218:LoadThresholds"/>
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+                    <xs:element minOccurs="0" name="loadThresholds" 
nillable="true" type="ax223:LoadThresholds"/>
                     <xs:element minOccurs="0" name="tenantId" type="xs:int"/>
                 </xs:sequence>
             </xs:complexType>
@@ -47,29 +33,17 @@
                 </xs:sequence>
             </xs:complexType>
         </xs:schema>
-<<<<<<< HEAD
-        <xs:schema xmlns:ax212="http://common.stratos.apache.org/xsd"; 
attributeFormDefault="qualified" elementFormDefault="qualified" 
targetNamespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd";>
-=======
-        <xs:schema xmlns:ax225="http://common.stratos.apache.org/xsd"; 
attributeFormDefault="qualified" elementFormDefault="qualified" 
targetNamespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd";>
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+        <xs:schema xmlns:ax26="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:complexType name="ApplicationContext">
                 <xs:sequence>
                     <xs:element minOccurs="0" name="alias" nillable="true" 
type="xs:string"/>
                     <xs:element minOccurs="0" name="applicationId" 
nillable="true" type="xs:string"/>
-<<<<<<< HEAD
-                    <xs:element minOccurs="0" name="components" 
nillable="true" type="ax211:ComponentContext"/>
-                    <xs:element minOccurs="0" name="description" 
nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="multiTenant" 
type="xs:boolean"/>
-                    <xs:element minOccurs="0" name="name" nillable="true" 
type="xs:string"/>
-                    <xs:element minOccurs="0" name="properties" 
nillable="true" type="ax27:Properties"/>
-=======
-                    <xs:element minOccurs="0" name="components" 
nillable="true" type="ax224:ComponentContext"/>
+                    <xs:element minOccurs="0" name="components" 
nillable="true" type="ax25:ComponentContext"/>
                     <xs:element minOccurs="0" name="description" 
nillable="true" type="xs:string"/>
                     <xs:element minOccurs="0" name="multiTenant" 
type="xs:boolean"/>
                     <xs:element minOccurs="0" name="name" nillable="true" 
type="xs:string"/>
-                    <xs:element minOccurs="0" name="properties" 
nillable="true" type="ax23:Properties"/>
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+                    <xs:element minOccurs="0" name="properties" 
nillable="true" type="ax26:Properties"/>
                     <xs:element minOccurs="0" name="status" nillable="true" 
type="xs:string"/>
                     <xs:element minOccurs="0" name="tenantAdminUsername" 
nillable="true" type="xs:string"/>
                     <xs:element minOccurs="0" name="tenantDomain" 
nillable="true" type="xs:string"/>
@@ -78,17 +52,10 @@
             </xs:complexType>
             <xs:complexType name="ComponentContext">
                 <xs:sequence>
-<<<<<<< HEAD
-                    <xs:element maxOccurs="unbounded" minOccurs="0" 
name="applicationClusterContexts" nillable="true" 
type="ax211:ApplicationClusterContext"/>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" 
name="cartridgeContexts" nillable="true" type="ax211:CartridgeContext"/>
-                    <xs:element minOccurs="0" name="dependencyContext" 
nillable="true" type="ax211:DependencyContext"/>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" 
name="groupContexts" nillable="true" type="ax211:GroupContext"/>
-=======
-                    <xs:element maxOccurs="unbounded" minOccurs="0" 
name="applicationClusterContexts" nillable="true" 
type="ax224:ApplicationClusterContext"/>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" 
name="cartridgeContexts" nillable="true" type="ax224:CartridgeContext"/>
-                    <xs:element minOccurs="0" name="dependencyContext" 
nillable="true" type="ax224:DependencyContext"/>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" 
name="groupContexts" nillable="true" type="ax224:GroupContext"/>
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+                    <xs:element maxOccurs="unbounded" minOccurs="0" 
name="applicationClusterContexts" nillable="true" 
type="ax25:ApplicationClusterContext"/>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" 
name="cartridgeContexts" nillable="true" type="ax25:CartridgeContext"/>
+                    <xs:element minOccurs="0" name="dependencyContext" 
nillable="true" type="ax25:DependencyContext"/>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" 
name="groupContexts" nillable="true" type="ax25:GroupContext"/>
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="ApplicationClusterContext">
@@ -99,13 +66,8 @@
                     <xs:element maxOccurs="unbounded" minOccurs="0" 
name="dependencyClusterIds" nillable="true" type="xs:string"/>
                     <xs:element minOccurs="0" name="deploymentPolicyName" 
nillable="true" type="xs:string"/>
                     <xs:element minOccurs="0" name="hostName" nillable="true" 
type="xs:string"/>
-<<<<<<< HEAD
-                    <xs:element minOccurs="0" name="persistenceContext" 
nillable="true" type="ax211:PersistenceContext"/>
-                    <xs:element minOccurs="0" name="properties" 
nillable="true" type="ax27:Properties"/>
-=======
-                    <xs:element minOccurs="0" name="persistenceContext" 
nillable="true" type="ax224:PersistenceContext"/>
-                    <xs:element minOccurs="0" name="properties" 
nillable="true" type="ax23:Properties"/>
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+                    <xs:element minOccurs="0" name="persistenceContext" 
nillable="true" type="ax25:PersistenceContext"/>
+                    <xs:element minOccurs="0" name="properties" 
nillable="true" type="ax26:Properties"/>
                     <xs:element minOccurs="0" name="tenantRange" 
nillable="true" type="xs:string"/>
                     <xs:element minOccurs="0" name="textPayload" 
nillable="true" type="xs:string"/>
                 </xs:sequence>
@@ -113,11 +75,7 @@
             <xs:complexType name="PersistenceContext">
                 <xs:sequence>
                     <xs:element minOccurs="0" name="persistenceRequired" 
type="xs:boolean"/>
-<<<<<<< HEAD
-                    <xs:element maxOccurs="unbounded" minOccurs="0" 
name="volumes" nillable="true" type="ax211:VolumeContext"/>
-=======
-                    <xs:element maxOccurs="unbounded" minOccurs="0" 
name="volumes" nillable="true" type="ax224:VolumeContext"/>
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+                    <xs:element maxOccurs="unbounded" minOccurs="0" 
name="volumes" nillable="true" type="ax25:VolumeContext"/>
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="VolumeContext">
@@ -136,34 +94,21 @@
                 <xs:sequence>
                     <xs:element minOccurs="0" name="cartridgeMax" 
type="xs:int"/>
                     <xs:element minOccurs="0" name="cartridgeMin" 
type="xs:int"/>
-<<<<<<< HEAD
-                    <xs:element minOccurs="0" name="subscribableInfoContext" 
nillable="true" type="ax211:SubscribableInfoContext"/>
-=======
-                    <xs:element minOccurs="0" name="subscribableInfoContext" 
nillable="true" type="ax224:SubscribableInfoContext"/>
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+                    <xs:element minOccurs="0" name="subscribableInfoContext" 
nillable="true" type="ax25:SubscribableInfoContext"/>
                     <xs:element minOccurs="0" name="type" nillable="true" 
type="xs:string"/>
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="SubscribableInfoContext">
                 <xs:sequence>
                     <xs:element minOccurs="0" name="alias" nillable="true" 
type="xs:string"/>
-<<<<<<< HEAD
-                    <xs:element minOccurs="0" name="artifactRepositoryContext" 
nillable="true" type="ax211:ArtifactRepositoryContext"/>
-=======
-                    <xs:element minOccurs="0" name="artifactRepositoryContext" 
nillable="true" type="ax224:ArtifactRepositoryContext"/>
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+                    <xs:element minOccurs="0" name="artifactRepositoryContext" 
nillable="true" type="ax25:ArtifactRepositoryContext"/>
                     <xs:element minOccurs="0" name="autoscalingPolicy" 
nillable="true" type="xs:string"/>
                     <xs:element maxOccurs="unbounded" minOccurs="0" 
name="dependencyAliases" nillable="true" type="xs:string"/>
                     <xs:element minOccurs="0" name="deploymentPolicy" 
nillable="true" type="xs:string"/>
                     <xs:element minOccurs="0" name="maxMembers" type="xs:int"/>
                     <xs:element minOccurs="0" name="minMembers" type="xs:int"/>
-<<<<<<< HEAD
-                    <xs:element minOccurs="0" name="persistenceContext" 
nillable="true" type="ax211:PersistenceContext"/>
-                    <xs:element minOccurs="0" name="properties" 
nillable="true" type="ax27:Properties"/>
-=======
-                    <xs:element minOccurs="0" name="persistenceContext" 
nillable="true" type="ax224:PersistenceContext"/>
-                    <xs:element minOccurs="0" name="properties" 
nillable="true" type="ax23:Properties"/>
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+                    <xs:element minOccurs="0" name="persistenceContext" 
nillable="true" type="ax25:PersistenceContext"/>
+                    <xs:element minOccurs="0" name="properties" 
nillable="true" type="ax26:Properties"/>
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="ArtifactRepositoryContext">
@@ -185,15 +130,9 @@
             <xs:complexType name="GroupContext">
                 <xs:sequence>
                     <xs:element minOccurs="0" name="alias" nillable="true" 
type="xs:string"/>
-<<<<<<< HEAD
-                    <xs:element maxOccurs="unbounded" minOccurs="0" 
name="cartridgeContexts" nillable="true" type="ax211:CartridgeContext"/>
-                    <xs:element minOccurs="0" name="deploymentPolicy" 
nillable="true" type="xs:string"/>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" 
name="groupContexts" nillable="true" type="ax211:GroupContext"/>
-=======
-                    <xs:element maxOccurs="unbounded" minOccurs="0" 
name="cartridgeContexts" nillable="true" type="ax224:CartridgeContext"/>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" 
name="cartridgeContexts" nillable="true" type="ax25:CartridgeContext"/>
                     <xs:element minOccurs="0" name="deploymentPolicy" 
nillable="true" type="xs:string"/>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" 
name="groupContexts" nillable="true" type="ax224:GroupContext"/>
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+                    <xs:element maxOccurs="unbounded" minOccurs="0" 
name="groupContexts" nillable="true" type="ax25:GroupContext"/>
                     <xs:element minOccurs="0" name="groupMaxInstances" 
type="xs:int"/>
                     <xs:element minOccurs="0" name="groupMinInstances" 
type="xs:int"/>
                     <xs:element minOccurs="0" name="name" nillable="true" 
type="xs:string"/>
@@ -204,13 +143,8 @@
             <xs:complexType name="ServiceGroup">
                 <xs:sequence>
                     <xs:element maxOccurs="unbounded" minOccurs="0" 
name="cartridges" nillable="true" type="xs:string"/>
-<<<<<<< HEAD
-                    <xs:element minOccurs="0" name="dependencies" 
nillable="true" type="ax21:Dependencies"/>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" 
name="groups" nillable="true" type="ax21:ServiceGroup"/>
-=======
-                    <xs:element minOccurs="0" name="dependencies" 
nillable="true" type="ax222:Dependencies"/>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" 
name="groups" nillable="true" type="ax222:ServiceGroup"/>
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+                    <xs:element minOccurs="0" name="dependencies" 
nillable="true" type="ax221:Dependencies"/>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" 
name="groups" nillable="true" type="ax221:ServiceGroup"/>
                     <xs:element minOccurs="0" name="name" nillable="true" 
type="xs:string"/>
                 </xs:sequence>
             </xs:complexType>
@@ -222,139 +156,69 @@
                 </xs:sequence>
             </xs:complexType>
         </xs:schema>
-<<<<<<< HEAD
-        <xs:schema 
xmlns:ax24="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax217="http://exception.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax22="http://pojo.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax219="http://policy.exception.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax215="http://application.exception.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax221="http://common.stratos.apache.org/xsd"; 
xmlns:ax213="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax210="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax225="http://rmi.java/xsd"; attributeFormDefault="qualified" 
elementFormDefault="qualified" 
targetNamespace="http://impl.services.autoscaler.stratos.apache.org";>
-            <xs:import 
namespace="http://pojo.autoscaler.stratos.apache.org/xsd"/>
-            <xs:import 
namespace="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"/>
+        <xs:schema 
xmlns:ax29="http://application.exception.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax27="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax24="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax216="http://rmi.java/xsd"; 
xmlns:ax218="http://policy.exception.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax220="http://exception.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax222="http://pojo.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax224="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax226="http://common.stratos.apache.org/xsd"; 
attributeFormDefault="qualified" elementFormDefault="qualified" 
targetNamespace="http://impl.services.autoscaler.stratos.apache.org";>
             <xs:import 
namespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"/>
             <xs:import 
namespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd"/>
             <xs:import 
namespace="http://application.exception.autoscaler.stratos.apache.org/xsd"/>
-            <xs:import 
namespace="http://exception.autoscaler.stratos.apache.org/xsd"/>
-            <xs:import 
namespace="http://policy.exception.autoscaler.stratos.apache.org/xsd"/>
-            <xs:import namespace="http://common.stratos.apache.org/xsd"/>
-            <xs:import namespace="http://rmi.java/xsd"/>
-            <xs:element name="getServiceGroup">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="name" nillable="true" 
type="xs:string"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getServiceGroupResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return" 
nillable="true" type="ax21:ServiceGroup"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getAutoscalingPolicy">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="autoscalingPolicyId" 
nillable="true" type="xs:string"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getAutoscalingPolicyResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return" 
nillable="true" type="ax23:AutoscalePolicy"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getDeploymentPolicy">
-=======
-        <xs:schema 
xmlns:ax26="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax216="http://application.exception.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax219="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax214="http://exception.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax221="http://common.stratos.apache.org/xsd"; 
xmlns:ax212="http://policy.exception.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax223="http://pojo.autoscaler.stratos.apache.org/xsd"; 
xmlns:ax210="http://rmi.java/xsd"; 
xmlns:ax226="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; 
attributeFormDefault="qualified" elementFormDefault="qualified" 
targetNamespace="http://impl.services.autoscaler.stratos.apache.org";>
-            <xs:import 
namespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"/>
             <xs:import namespace="http://rmi.java/xsd"/>
             <xs:import 
namespace="http://policy.exception.autoscaler.stratos.apache.org/xsd"/>
             <xs:import 
namespace="http://exception.autoscaler.stratos.apache.org/xsd"/>
-            <xs:import 
namespace="http://application.exception.autoscaler.stratos.apache.org/xsd"/>
+            <xs:import 
namespace="http://pojo.autoscaler.stratos.apache.org/xsd"/>
             <xs:import 
namespace="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"/>
             <xs:import namespace="http://common.stratos.apache.org/xsd"/>
-            <xs:import 
namespace="http://pojo.autoscaler.stratos.apache.org/xsd"/>
-            <xs:import 
namespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd"/>
-            <xs:element name="getDeploymentPolicies">
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+            <xs:element name="getApplicationPolicy">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="deploymentPolicyID" 
nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="applicationPolicyId" 
nillable="true" type="xs:string"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getDeploymentPolicyResponse">
+            <xs:element name="getApplicationPolicyResponse">
                 <xs:complexType>
                     <xs:sequence>
-<<<<<<< HEAD
-                        <xs:element minOccurs="0" name="return" 
nillable="true" type="ax25:DeploymentPolicy"/>
-=======
-                        <xs:element maxOccurs="unbounded" minOccurs="0" 
name="return" nillable="true" type="ax26:DeploymentPolicy"/>
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+                        <xs:element minOccurs="0" name="return" 
nillable="true" type="ax24:ApplicationPolicy"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="getApplication">
                 <xs:complexType>
                     <xs:sequence>
-<<<<<<< HEAD
                         <xs:element minOccurs="0" name="applicationId" 
nillable="true" type="xs:string"/>
-=======
-                        <xs:element minOccurs="0" name="RemoteException" 
nillable="true" type="ax27:RemoteException"/>
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="getApplicationResponse">
                 <xs:complexType>
                     <xs:sequence>
-<<<<<<< HEAD
-                        <xs:element minOccurs="0" name="return" 
nillable="true" type="ax213:ApplicationContext"/>
-=======
-                        <xs:element minOccurs="0" 
name="InvalidDeploymentPolicyException" nillable="true" 
type="ax212:InvalidDeploymentPolicyException"/>
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+                        <xs:element minOccurs="0" name="return" 
nillable="true" type="ax27:ApplicationContext"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="AutoscalerServiceApplicationDefinitionException">
                 <xs:complexType>
                     <xs:sequence>
-<<<<<<< HEAD
-                        <xs:element minOccurs="0" 
name="ApplicationDefinitionException" nillable="true" 
type="ax214:ApplicationDefinitionException"/>
-=======
-                        <xs:element minOccurs="0" 
name="DeploymentPolicyNotExistsException" nillable="true" 
type="ax212:DeploymentPolicyNotExistsException"/>
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+                        <xs:element minOccurs="0" 
name="ApplicationDefinitionException" nillable="true" 
type="ax29:ApplicationDefinitionException"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="updateApplication">
                 <xs:complexType>
                     <xs:sequence>
-<<<<<<< HEAD
-                        <xs:element minOccurs="0" name="applicationContext" 
nillable="true" type="ax213:ApplicationContext"/>
-=======
-                        <xs:element minOccurs="0" 
name="InvalidPolicyException" nillable="true" 
type="ax212:InvalidPolicyException"/>
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+                        <xs:element minOccurs="0" name="applicationContext" 
nillable="true" type="ax27:ApplicationContext"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="updateApplicationResponse">
                 <xs:complexType>
                     <xs:sequence>
-<<<<<<< HEAD
                         <xs:element minOccurs="0" name="return" 
type="xs:boolean"/>
-=======
-                        <xs:element minOccurs="0" 
name="CloudControllerConnectionException" nillable="true" 
type="ax214:CloudControllerConnectionException"/>
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="deleteApplication">
                 <xs:complexType>
                     <xs:sequence>
-<<<<<<< HEAD
                         <xs:element minOccurs="0" name="applicationId" 
nillable="true" type="xs:string"/>
-=======
-                        <xs:element minOccurs="0" name="deploymentPolicy" 
nillable="true" type="ax26:DeploymentPolicy"/>
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
@@ -365,564 +229,204 @@
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element 
name="AutoscalerServiceAutoScalingPolicyAlreadyExistException">
-                <xs:complexType>
-                    <xs:sequence>
-<<<<<<< HEAD
-                        <xs:element minOccurs="0" 
name="AutoScalingPolicyAlreadyExistException" nillable="true" 
type="ax217:AutoScalingPolicyAlreadyExistException"/>
-=======
-                        <xs:element minOccurs="0" 
name="InvalidApplicationPolicyException" nillable="true" 
type="ax216:InvalidApplicationPolicyException"/>
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="addAutoScalingPolicy">
-                <xs:complexType>
-                    <xs:sequence>
-<<<<<<< HEAD
-                        <xs:element minOccurs="0" name="autoscalePolicy" 
nillable="true" type="ax23:AutoscalePolicy"/>
-=======
-                        <xs:element minOccurs="0" name="applicationPolicy" 
nillable="true" type="ax26:ApplicationPolicy"/>
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="addAutoScalingPolicyResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return" 
type="xs:boolean"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getAutoScalingPolicies">
+            <xs:element name="getDeploymentPolicies">
                 <xs:complexType>
                     <xs:sequence/>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getAutoScalingPoliciesResponse">
+            <xs:element name="getDeploymentPoliciesResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0" 
name="return" nillable="true" type="ax23:AutoscalePolicy"/>
+                        <xs:element maxOccurs="unbounded" minOccurs="0" 
name="return" nillable="true" type="ax24:DeploymentPolicy"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="AutoscalerServiceInvalidPolicyException">
+            <xs:element name="AutoscalerServiceRemoteException">
                 <xs:complexType>
                     <xs:sequence>
-<<<<<<< HEAD
-                        <xs:element minOccurs="0" 
name="InvalidPolicyException" nillable="true" 
type="ax219:InvalidPolicyException"/>
-=======
-                        <xs:element minOccurs="0" 
name="ApplicatioinPolicyNotExistsException" nillable="true" 
type="ax212:ApplicatioinPolicyNotExistsException"/>
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+                        <xs:element minOccurs="0" name="RemoteException" 
nillable="true" type="ax216:RemoteException"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="updateAutoScalingPolicy">
+            <xs:element 
name="AutoscalerServiceInvalidDeploymentPolicyException">
                 <xs:complexType>
                     <xs:sequence>
-<<<<<<< HEAD
-                        <xs:element minOccurs="0" name="autoscalePolicy" 
nillable="true" type="ax23:AutoscalePolicy"/>
-=======
-                        <xs:element minOccurs="0" name="applicationPolicy" 
nillable="true" type="ax26:ApplicationPolicy"/>
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+                        <xs:element minOccurs="0" 
name="InvalidDeploymentPolicyException" nillable="true" 
type="ax217:InvalidDeploymentPolicyException"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="updateAutoScalingPolicyResponse">
+            <xs:element 
name="AutoscalerServiceDeploymentPolicyNotExistsException">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" 
type="xs:boolean"/>
+                        <xs:element minOccurs="0" 
name="DeploymentPolicyNotExistsException" nillable="true" 
type="ax217:DeploymentPolicyNotExistsException"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="AutoscalerServiceUnremovablePolicyException">
+            <xs:element name="AutoscalerServiceInvalidPolicyException">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" 
name="UnremovablePolicyException" nillable="true" 
type="ax219:UnremovablePolicyException"/>
+                        <xs:element minOccurs="0" 
name="InvalidPolicyException" nillable="true" 
type="ax217:InvalidPolicyException"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="AutoscalerServicePolicyDoesNotExistException">
+            <xs:element 
name="AutoscalerServiceCloudControllerConnectionException">
                 <xs:complexType>
                     <xs:sequence>
-<<<<<<< HEAD
-                        <xs:element minOccurs="0" 
name="PolicyDoesNotExistException" nillable="true" 
type="ax219:PolicyDoesNotExistException"/>
+                        <xs:element minOccurs="0" 
name="CloudControllerConnectionException" nillable="true" 
type="ax219:CloudControllerConnectionException"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="removeAutoScalingPolicy">
+            <xs:element name="updateDeploymentPolicy">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="autoscalePolicyId" 
nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="deploymentPolicy" 
nillable="true" type="ax24:DeploymentPolicy"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="removeAutoScalingPolicyResponse">
+            <xs:element name="updateDeploymentPolicyResponse">
                 <xs:complexType>
                     <xs:sequence>
                         <xs:element minOccurs="0" name="return" 
type="xs:boolean"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="existApplication">
-=======
-                        <xs:element maxOccurs="unbounded" minOccurs="0" 
name="return" nillable="true" type="ax26:ApplicationPolicy"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element 
name="AutoscalerServiceAutoScalingPolicyAlreadyExistException">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" 
name="AutoScalingPolicyAlreadyExistException" nillable="true" 
type="ax214:AutoScalingPolicyAlreadyExistException"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="addAutoScalingPolicy">
+            <xs:element 
name="AutoscalerServiceInvalidApplicationPolicyException">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="autoscalePolicy" 
nillable="true" type="ax219:AutoscalePolicy"/>
+                        <xs:element minOccurs="0" 
name="InvalidApplicationPolicyException" nillable="true" 
type="ax29:InvalidApplicationPolicyException"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="addAutoScalingPolicyResponse">
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+            <xs:element name="addApplicationPolicy">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" 
type="xs:boolean"/>
+                        <xs:element minOccurs="0" name="applicationPolicy" 
nillable="true" type="ax24:ApplicationPolicy"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-<<<<<<< HEAD
-            <xs:element name="existApplicationResponse">
+            <xs:element name="addApplicationPolicyResponse">
                 <xs:complexType>
                     <xs:sequence>
                         <xs:element minOccurs="0" name="return" 
type="xs:boolean"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="deployApplication">
+            <xs:element name="removeApplicationPolicy">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="applicationId" 
nillable="true" type="xs:string"/>
                         <xs:element minOccurs="0" name="applicationPolicyId" 
nillable="true" type="xs:string"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="deployApplicationResponse">
-=======
-            <xs:element name="getAutoScalingPolicies">
-                <xs:complexType>
-                    <xs:sequence/>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getAutoScalingPoliciesResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0" 
name="return" nillable="true" type="ax219:AutoscalePolicy"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="updateAutoScalingPolicy">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="autoscalePolicy" 
nillable="true" type="ax219:AutoscalePolicy"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="updateAutoScalingPolicyResponse">
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return" 
type="xs:boolean"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-<<<<<<< HEAD
-            <xs:element name="undeployApplication">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="applicationId" 
nillable="true" type="xs:string"/>
-                        <xs:element minOccurs="0" name="force" 
type="xs:boolean"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="undeployApplicationResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return" 
type="xs:boolean"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="AutoscalerServiceInvalidArgumentException">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" 
name="InvalidArgumentException" nillable="true" 
type="ax217:InvalidArgumentException"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="updateClusterMonitor">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="clusterId" 
nillable="true" type="xs:string"/>
-                        <xs:element minOccurs="0" name="properties" 
nillable="true" type="ax27:Properties"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="updateClusterMonitorResponse">
-=======
-            <xs:element name="AutoscalerServiceUnremovablePolicyException">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" 
name="UnremovablePolicyException" nillable="true" 
type="ax212:UnremovablePolicyException"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="AutoscalerServicePolicyDoesNotExistException">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" 
name="PolicyDoesNotExistException" nillable="true" 
type="ax212:PolicyDoesNotExistException"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="removeAutoScalingPolicy">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="autoscalePolicyId" 
nillable="true" type="xs:string"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="removeAutoScalingPolicyResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return" 
type="xs:boolean"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="existApplication">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="applicationId" 
nillable="true" type="xs:string"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="existApplicationResponse">
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+            <xs:element name="removeApplicationPolicyResponse">
                 <xs:complexType>
                     <xs:sequence>
                         <xs:element minOccurs="0" name="return" 
type="xs:boolean"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-<<<<<<< HEAD
-            <xs:element name="AutoscalerServiceInvalidServiceGroupException">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" 
name="InvalidServiceGroupException" nillable="true" 
type="ax214:InvalidServiceGroupException"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="addServiceGroup">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="servicegroup" 
nillable="true" type="ax21:ServiceGroup"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="addServiceGroupResponse">
-=======
-            <xs:element name="AutoscalerServiceApplicationDefinitionException">
+            <xs:element 
name="AutoscalerServiceApplicatioinPolicyNotExistsException">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" 
name="ApplicationDefinitionException" nillable="true" 
type="ax216:ApplicationDefinitionException"/>
+                        <xs:element minOccurs="0" 
name="ApplicatioinPolicyNotExistsException" nillable="true" 
type="ax217:ApplicatioinPolicyNotExistsException"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="deployApplication">
+            <xs:element name="updateApplicationPolicy">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="applicationId" 
nillable="true" type="xs:string"/>
-                        <xs:element minOccurs="0" name="applicationPolicyId" 
nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="applicationPolicy" 
nillable="true" type="ax24:ApplicationPolicy"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="deployApplicationResponse">
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+            <xs:element name="updateApplicationPolicyResponse">
                 <xs:complexType>
                     <xs:sequence>
                         <xs:element minOccurs="0" name="return" 
type="xs:boolean"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-<<<<<<< HEAD
-            <xs:element name="findClusterId">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="applicationId" 
nillable="true" type="xs:string"/>
-                        <xs:element minOccurs="0" name="alias" nillable="true" 
type="xs:string"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="findClusterIdResponse">
-=======
-            <xs:element name="undeployApplication">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="applicationId" 
nillable="true" type="xs:string"/>
-                        <xs:element minOccurs="0" name="force" 
type="xs:boolean"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="undeployApplicationResponse">
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return" 
nillable="true" type="xs:string"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-<<<<<<< HEAD
-            <xs:element name="AutoscalerServiceAutoScalerException">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="AutoScalerException" 
nillable="true" type="ax217:AutoScalerException"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getApplicationNetworkPartitions">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="applicationId" 
nillable="true" type="xs:string"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getApplicationNetworkPartitionsResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0" 
name="return" nillable="true" type="xs:string"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="AutoscalerServiceRemoteException">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="RemoteException" 
nillable="true" type="ax222:RemoteException"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element 
name="AutoscalerServiceInvalidDeploymentPolicyException">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" 
name="InvalidDeploymentPolicyException" nillable="true" 
type="ax219:InvalidDeploymentPolicyException"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element 
name="AutoscalerServiceDeploymentPolicyAlreadyExistsException">
-=======
-            <xs:element name="AutoscalerServiceInvalidArgumentException">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" 
name="InvalidArgumentException" nillable="true" 
type="ax214:InvalidArgumentException"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="updateClusterMonitor">
+            <xs:element name="getApplicationPolicies">
                 <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="clusterId" 
nillable="true" type="xs:string"/>
-                        <xs:element minOccurs="0" name="properties" 
nillable="true" type="ax23:Properties"/>
-                    </xs:sequence>
+                    <xs:sequence/>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="updateClusterMonitorResponse">
+            <xs:element name="getApplicationPoliciesResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" 
type="xs:boolean"/>
+                        <xs:element maxOccurs="unbounded" minOccurs="0" 
name="return" nillable="true" type="ax24:ApplicationPolicy"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="AutoscalerServiceInvalidServiceGroupException">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" 
name="InvalidServiceGroupException" nillable="true" 
type="ax216:InvalidServiceGroupException"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="addServiceGroup">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="servicegroup" 
nillable="true" type="ax222:ServiceGroup"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="addServiceGroupResponse">
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" 
name="DeploymentPolicyAlreadyExistsException" nillable="true" 
type="ax219:DeploymentPolicyAlreadyExistsException"/>
+                        <xs:element minOccurs="0" 
name="InvalidServiceGroupException" nillable="true" 
type="ax29:InvalidServiceGroupException"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-<<<<<<< HEAD
-            <xs:element name="addDeployementPolicy">
+            <xs:element name="updateServiceGroup">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="deploymentPolicy" 
nillable="true" type="ax25:DeploymentPolicy"/>
+                        <xs:element minOccurs="0" name="cartridgeGroup" 
nillable="true" type="ax221:ServiceGroup"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="addDeployementPolicyResponse">
+            <xs:element name="updateServiceGroupResponse">
                 <xs:complexType>
                     <xs:sequence>
                         <xs:element minOccurs="0" name="return" 
type="xs:boolean"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element 
name="AutoscalerServiceDeploymentPolicyNotExistsException">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" 
name="DeploymentPolicyNotExistsException" nillable="true" 
type="ax219:DeploymentPolicyNotExistsException"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="removeDeployementPolicy">
+            <xs:element name="serviceGroupExist">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="deploymentPolicyID" 
nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="serviceName" 
nillable="true" type="xs:string"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="removeDeployementPolicyResponse">
+            <xs:element name="serviceGroupExistResponse">
                 <xs:complexType>
                     <xs:sequence>
                         <xs:element minOccurs="0" name="return" 
type="xs:boolean"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="undeployServiceGroup">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="name" nillable="true" 
type="xs:string"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="undeployServiceGroupResponse">
-=======
-            <xs:element name="findClusterId">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="applicationId" 
nillable="true" type="xs:string"/>
-                        <xs:element minOccurs="0" name="alias" nillable="true" 
type="xs:string"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="findClusterIdResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return" 
nillable="true" type="xs:string"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
             <xs:element name="AutoscalerServiceAutoScalerException">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="AutoScalerException" 
nillable="true" type="ax214:AutoScalerException"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getApplicationNetworkPartitions">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="applicationId" 
nillable="true" type="xs:string"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getApplicationNetworkPartitionsResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0" 
name="return" nillable="true" type="xs:string"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element 
name="AutoscalerServiceDeploymentPolicyAlreadyExistsException">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" 
name="DeploymentPolicyAlreadyExistsException" nillable="true" 
type="ax212:DeploymentPolicyAlreadyExistsException"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="addDeployementPolicy">
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="deploymentPolicy" 
nillable="true" type="ax26:DeploymentPolicy"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-<<<<<<< HEAD
-            <xs:element name="getApplicationPolicy">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="applicationPolicyId" 
nillable="true" type="xs:string"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getApplicationPolicyResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return" 
nillable="true" type="ax25:ApplicationPolicy"/>
+                        <xs:element minOccurs="0" name="AutoScalerException" 
nillable="true" type="ax219:AutoScalerException"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getApplications">
+            <xs:element name="getServiceGroups">
                 <xs:complexType>
                     <xs:sequence/>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getApplicationsResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0" 
name="return" nillable="true" type="ax213:ApplicationContext"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="addApplication">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="applicationContext" 
nillable="true" type="ax213:ApplicationContext"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="addApplicationResponse">
-=======
-            <xs:element name="addDeployementPolicyResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return" 
type="xs:boolean"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="removeDeployementPolicy">
+            <xs:element name="getServiceGroupsResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="deploymentPolicyID" 
nillable="true" type="xs:string"/>
+                        <xs:element maxOccurs="unbounded" minOccurs="0" 
name="return" nillable="true" type="ax221:ServiceGroup"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="removeDeployementPolicyResponse">
+            <xs:element 
name="AutoscalerServiceCartridgeGroupNotFoundException">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" 
type="xs:boolean"/>
+                        <xs:element minOccurs="0" 
name="CartridgeGroupNotFoundException" nillable="true" 
type="ax219:CartridgeGroupNotFoundException"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="undeployServiceGroup">
+            <xs:element name="removeServiceGroup">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="name" nillable="true" 
type="xs:string"/>
+                        <xs:element minOccurs="0" name="groupName" 
nillable="true" type="xs:string"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="undeployServiceGroupResponse">
+            <xs:element name="removeServiceGroupResponse">
                 <xs:complexType>
                     <xs:sequence>
                         <xs:element minOccurs="0" name="return" 
type="xs:boolean"/>
@@ -935,364 +439,329 @@
                 </xs:complexType>
             </xs:element>
             <xs:element name="getApplicationsResponse">
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0" 
name="return" nillable="true" type="ax224:ApplicationContext"/>
+                        <xs:element maxOccurs="unbounded" minOccurs="0" 
name="return" nillable="true" type="ax27:ApplicationContext"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-<<<<<<< HEAD
-            <xs:element name="getDeploymentPolicies">
+            <xs:element name="addApplication">
                 <xs:complexType>
-                    <xs:sequence/>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="applicationContext" 
nillable="true" type="ax27:ApplicationContext"/>
+                    </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getDeploymentPoliciesResponse">
+            <xs:element name="addApplicationResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0" 
name="return" nillable="true" type="ax25:DeploymentPolicy"/>
+                        <xs:element minOccurs="0" name="return" 
type="xs:boolean"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element 
name="AutoscalerServiceCloudControllerConnectionException">
-=======
-            <xs:element name="addApplication">
+            <xs:element name="getServiceGroup">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="applicationContext" 
nillable="true" type="ax224:ApplicationContext"/>
+                        <xs:element minOccurs="0" name="name" nillable="true" 
type="xs:string"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="addApplicationResponse">
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+            <xs:element name="getServiceGroupResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" 
name="CloudControllerConnectionException" nillable="true" 
type="ax217:CloudControllerConnectionException"/>
+                        <xs:element minOccurs="0" name="return" 
nillable="true" type="ax221:ServiceGroup"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-<<<<<<< HEAD
-            <xs:element name="updateDeploymentPolicy">
+            <xs:element name="getAutoscalingPolicy">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="deploymentPolicy" 
nillable="true" type="ax25:DeploymentPolicy"/>
+                        <xs:element minOccurs="0" name="autoscalingPolicyId" 
nillable="true" type="xs:string"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="updateDeploymentPolicyResponse">
-=======
-            <xs:element name="getApplication">
+            <xs:element name="getAutoscalingPolicyResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="applicationId" 
nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="return" 
nillable="true" type="ax223:AutoscalePolicy"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getApplicationResponse">
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+            <xs:element name="getDeploymentPolicy">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" 
nillable="true" type="ax224:ApplicationContext"/>
+                        <xs:element minOccurs="0" name="deploymentPolicyID" 
nillable="true" type="xs:string"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-<<<<<<< HEAD
-            <xs:element 
name="AutoscalerServiceInvalidApplicationPolicyException">
+            <xs:element name="getDeploymentPolicyResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" 
name="InvalidApplicationPolicyException" nillable="true" 
type="ax214:InvalidApplicationPolicyException"/>
+                        <xs:element minOccurs="0" name="return" 
nillable="true" type="ax24:DeploymentPolicy"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="addApplicationPolicy">
+            <xs:element 
name="AutoscalerServiceAutoScalingPolicyAlreadyExistException">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="applicationPolicy" 
nillable="true" type="ax25:ApplicationPolicy"/>
+                        <xs:element minOccurs="0" 
name="AutoScalingPolicyAlreadyExistException" nillable="true" 
type="ax219:AutoScalingPolicyAlreadyExistException"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="addApplicationPolicyResponse">
-=======
-            <xs:element name="updateApplication">
+            <xs:element name="addAutoScalingPolicy">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="applicationContext" 
nillable="true" type="ax224:ApplicationContext"/>
+                        <xs:element minOccurs="0" name="autoscalePolicy" 
nillable="true" type="ax223:AutoscalePolicy"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="updateApplicationResponse">
+            <xs:element name="addAutoScalingPolicyResponse">
                 <xs:complexType>
                     <xs:sequence>
                         <xs:element minOccurs="0" name="return" 
type="xs:boolean"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="deleteApplication">
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+            <xs:element name="getAutoScalingPolicies">
                 <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="applicationId" 
nillable="true" type="xs:string"/>
-                    </xs:sequence>
+                    <xs:sequence/>
                 </xs:complexType>
             </xs:element>
-<<<<<<< HEAD
-            <xs:element name="removeApplicationPolicy">
+            <xs:element name="getAutoScalingPoliciesResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="applicationPolicyId" 
nillable="true" type="xs:string"/>
+                        <xs:element maxOccurs="unbounded" minOccurs="0" 
name="return" nillable="true" type="ax223:AutoscalePolicy"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="removeApplicationPolicyResponse">
+            <xs:element name="updateAutoScalingPolicy">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" 
type="xs:boolean"/>
+                        <xs:element minOccurs="0" name="autoscalePolicy" 
nillable="true" type="ax223:AutoscalePolicy"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element 
name="AutoscalerServiceApplicatioinPolicyNotExistsException">
-=======
-            <xs:element name="deleteApplicationResponse">
+            <xs:element name="updateAutoScalingPolicyResponse">
                 <xs:complexType>
                     <xs:sequence>
                         <xs:element minOccurs="0" name="return" 
type="xs:boolean"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="serviceGroupExist">
+            <xs:element name="AutoscalerServiceUnremovablePolicyException">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="serviceName" 
nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" 
name="UnremovablePolicyException" nillable="true" 
type="ax217:UnremovablePolicyException"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="serviceGroupExistResponse">
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+            <xs:element name="AutoscalerServicePolicyDoesNotExistException">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" 
name="ApplicatioinPolicyNotExistsException" nillable="true" 
type="ax219:ApplicatioinPolicyNotExistsException"/>
+                        <xs:element minOccurs="0" 
name="PolicyDoesNotExistException" nillable="true" 
type="ax217:PolicyDoesNotExistException"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-<<<<<<< HEAD
-            <xs:element name="updateApplicationPolicy">
+            <xs:element name="removeAutoScalingPolicy">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="applicationPolicy" 
nillable="true" type="ax25:ApplicationPolicy"/>
+                        <xs:element minOccurs="0" name="autoscalePolicyId" 
nillable="true" type="xs:string"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="updateApplicationPolicyResponse">
+            <xs:element name="removeAutoScalingPolicyResponse">
                 <xs:complexType>
                     <xs:sequence>
                         <xs:element minOccurs="0" name="return" 
type="xs:boolean"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getApplicationPolicies">
+            <xs:element name="existApplication">
                 <xs:complexType>
-                    <xs:sequence/>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="applicationId" 
nillable="true" type="xs:string"/>
+                    </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getApplicationPoliciesResponse">
+            <xs:element name="existApplicationResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0" 
name="return" nillable="true" type="ax25:ApplicationPolicy"/>
+                        <xs:element minOccurs="0" name="return" 
type="xs:boolean"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="updateServiceGroup">
+            <xs:element name="deployApplication">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="cartridgeGroup" 
nillable="true" type="ax21:ServiceGroup"/>
+                        <xs:element minOccurs="0" name="applicationId" 
nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="applicationPolicyId" 
nillable="true" type="xs:string"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="updateServiceGroupResponse">
+            <xs:element name="deployApplicationResponse">
                 <xs:complexType>
                     <xs:sequence>
                         <xs:element minOccurs="0" name="return" 
type="xs:boolean"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="serviceGroupExist">
+            <xs:element name="undeployApplication">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="serviceName" 
nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="applicationId" 
nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="force" 
type="xs:boolean"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="serviceGroupExistResponse">
-=======
-            <xs:element name="getServiceGroups">
+            <xs:element name="undeployApplicationResponse">
                 <xs:complexType>
-                    <xs:sequence/>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return" 
type="xs:boolean"/>
+                    </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getServiceGroupsResponse">
+            <xs:element name="AutoscalerServiceInvalidArgumentException">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0" 
name="return" nillable="true" type="ax222:ServiceGroup"/>
+                        <xs:element minOccurs="0" 
name="InvalidArgumentException" nillable="true" 
type="ax219:InvalidArgumentException"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element 
name="AutoscalerServiceCartridgeGroupNotFoundException">
+            <xs:element name="updateClusterMonitor">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" 
name="CartridgeGroupNotFoundException" nillable="true" 
type="ax214:CartridgeGroupNotFoundException"/>
+                        <xs:element minOccurs="0" name="clusterId" 
nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="properties" 
nillable="true" type="ax22:Properties"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="removeServiceGroup">
+            <xs:element name="updateClusterMonitorResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="groupName" 
nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="return" 
type="xs:boolean"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="removeServiceGroupResponse">
+            <xs:element name="addServiceGroup">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" 
type="xs:boolean"/>
+                        <xs:element minOccurs="0" name="servicegroup" 
nillable="true" type="ax221:ServiceGroup"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getApplicationPolicy">
+            <xs:element name="addServiceGroupResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="applicationPolicyId" 
nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="return" 
type="xs:boolean"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getApplicationPolicyResponse">
+            <xs:element name="findClusterId">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" 
nillable="true" type="ax26:ApplicationPolicy"/>
+                        <xs:element minOccurs="0" name="applicationId" 
nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="alias" nillable="true" 
type="xs:string"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getServiceGroup">
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+            <xs:element name="findClusterIdResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="name" nillable="true" 
type="xs:string"/>
+                        <xs:element minOccurs="0" name="return" 
nillable="true" type="xs:string"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-<<<<<<< HEAD
-            <xs:element name="getServiceGroups">
+            <xs:element name="getApplicationNetworkPartitions">
                 <xs:complexType>
-                    <xs:sequence/>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="applicationId" 
nillable="true" type="xs:string"/>
+                    </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getServiceGroupsResponse">
+            <xs:element name="getApplicationNetworkPartitionsResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0" 
name="return" nillable="true" type="ax21:ServiceGroup"/>
+                        <xs:element maxOccurs="unbounded" minOccurs="0" 
name="return" nillable="true" type="xs:string"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element 
name="AutoscalerServiceCartridgeGroupNotFoundException">
+            <xs:element 
name="AutoscalerServiceDeploymentPolicyAlreadyExistsException">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" 
name="CartridgeGroupNotFoundException" nillable="true" 
type="ax217:CartridgeGroupNotFoundException"/>
+                        <xs:element minOccurs="0" 
name="DeploymentPolicyAlreadyExistsException" nillable="true" 
type="ax217:DeploymentPolicyAlreadyExistsException"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="removeServiceGroup">
+            <xs:element name="addDeployementPolicy">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="groupName" 
nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="deploymentPolicy" 
nillable="true" type="ax24:DeploymentPolicy"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="removeServiceGroupResponse">
-=======
-            <xs:element name="getServiceGroupResponse">
+            <xs:element name="addDeployementPolicyResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" 
nillable="true" type="ax222:ServiceGroup"/>
+                        <xs:element minOccurs="0" name="return" 
type="xs:boolean"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getAutoscalingPolicy">
+            <xs:element name="removeDeployementPolicy">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="autoscalingPolicyId" 
nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="deploymentPolicyID" 
nillable="true" type="xs:string"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getAutoscalingPolicyResponse">
+            <xs:element name="removeDeployementPolicyResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" 
nillable="true" type="ax219:AutoscalePolicy"/>
+                        <xs:element minOccurs="0" name="return" 
type="xs:boolean"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getDeploymentPolicy">
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+            <xs:element name="undeployServiceGroup">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="deploymentPolicyID" 
nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="name" nillable="true" 
type="xs:string"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getDeploymentPolicyResponse">
+            <xs:element name="undeployServiceGroupResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" 
nillable="true" type="ax26:DeploymentPolicy"/>
+                        <xs:element minOccurs="0" name="return" 
type="xs:boolean"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
         </xs:schema>
-<<<<<<< HEAD
-        <xs:schema xmlns:ax29="http://partition.common.stratos.apache.org/xsd"; 
xmlns:ax226="http://common.stratos.apache.org/xsd"; 
attributeFormDefault="qualified" elementFormDefault="qualified" 
targetNamespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd";>
-=======
-        <xs:schema xmlns:ax25="http://partition.common.stratos.apache.org/xsd"; 
xmlns:ax217="http://common.stratos.apache.org/xsd"; 
attributeFormDefault="qualified" elementFormDefault="qualified" 
targetNamespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd";>
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
-            <xs:import 
namespace="http://partition.common.stratos.apache.org/xsd"/>
+        <xs:schema xmlns:ax23="http://common.stratos.apache.org/xsd"; 
xmlns:ax212="http://partition.common.stratos.apache.org/xsd"; 
attributeFormDefault="qualified" elementFormDefault="qualified" 
targetNamespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd";>
             <xs:import namespace="http://common.stratos.apache.org/xsd"/>
-            <xs:complexType name="DeploymentPolicy">
-                <xs:sequence>
-                    <xs:element minOccurs="0" name="deploymentPolicyID" 
nillable="true" type="xs:string"/>
-<<<<<<< HEAD
-                    <xs:element maxOccurs="unbounded" minOccurs="0" 
name="networkPartitions" nillable="true" type="ax29:NetworkPartition"/>
-=======
-                    <xs:element maxOccurs="unbounded" minOccurs="0" 
name="networkPartitionRefs" nillable="true" type="ax25:NetworkPartitionRef"/>
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
-                </xs:sequence>
-            </xs:complexType>
+            <xs:import 
namespace="http://partition.common.stratos.apache.org/xsd"/>
             <xs:complexType name="ApplicationPolicy">
                 <xs:sequence>
                     <xs:element minOccurs="0" name="algorithm" nillable="true" 
type="xs:string"/>
                     <xs:element minOccurs="0" name="id" nillable="true" 
type="xs:string"/>
                     <xs:element maxOccurs="unbounded" minOccurs="0" 
name="networkPartitionGroups" nillable="true" type="xs:string"/>
                     <xs:element maxOccurs="unbounded" minOccurs="0" 
name="networkPartitions" nillable="true" type="xs:string"/>
-<<<<<<< HEAD
-                    <xs:element minOccurs="0" name="properties" 
nillable="true" type="ax27:Properties"/>
+                    <xs:element minOccurs="0" name="properties" 
nillable="true" type="ax23:Properties"/>
                 </xs:sequence>
             </xs:complexType>
-        </xs:schema>
-        <xs:schema xmlns:ax28="http://common.stratos.apache.org/xsd"; 
attributeFormDefault="qualified" elementFormDefault="qualified" 
targetNamespace="http://partition.common.stratos.apache.org/xsd";>
-=======
-                    <xs:element minOccurs="0" name="properties" 
nillable="true" type="ax23:Properties"/>
+            <xs:complexType name="DeploymentPolicy">
+                <xs:sequence>
+                    <xs:element minOccurs="0" name="deploymentPolicyID" 
nillable="true" type="xs:string"/>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" 
name="networkPartitionRefs" nillable="true" type="ax212:NetworkPartitionRef"/>
                 </xs:sequence>
             </xs:complexType>
         </xs:schema>
-        <xs:schema xmlns:ax24="http://common.stratos.apache.org/xsd"; 
attributeFormDefault="qualified" elementFormDefault="qualified" 
targetNamespace="http://partition.common.stratos.apache.org/xsd";>
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+        <xs:schema xmlns:ax211="http://common.stratos.apache.org/xsd"; 
attributeFormDefault="qualified" elementFormDefault="qualified" 
targetNamespace="http://partition.common.stratos.apache.org/xsd";>
             <xs:import namespace="http://common.stratos.apache.org/xsd"/>
             <xs:complexType name="NetworkPartitionRef">
                 <xs:sequence>
                     <xs:element minOccurs="0" name="id" nillable="true" 
type="xs:string"/>
                     <xs:element minOccurs="0" name="partitionAlgo" 
nillable="true" type="xs:string"/>
-<<<<<<< HEAD
-                    <xs:element maxOccurs="unbounded" minOccurs="0" 
name="partitions" nillable="true" type="ax26:Partition"/>
-=======
-                    <xs:element maxOccurs="unbounded" minOccurs="0" 
name="partitions" nillable="true" type="ax22:PartitionRef"/>
->>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
-                    <xs:element minOccurs="0" name="provider" nillable="true" 
type="xs:string"/>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" 
name="partitionRefs" nillable="true" type="ax210:PartitionRef"/>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" 
name="partitions" nillable="true" type="ax210:PartitionRef"/>
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="PartitionRef">
@@ -1301,12 +770,7 @@
                     <xs:element minOccurs="0" name="id" nillable="true" 
type="xs:string"/>
                     <xs:element minOccurs="0" name="kubernetesClusterId" 
nillable="true" type="xs:string"/>
                     <xs:element minOccurs="0" name="partitionMax" 
type="xs:int"/>
-<<<<<<< HEAD
-                    <xs:element minOccurs="0" name="properties" 
nillable="true" type="ax27:Properties"/>
-                    <xs:element minOccurs="0" name="provider" nillable="true" 
type="xs:string"/>
-=======
-                    <xs:element minOccurs="0" name="properties" 
nillable="true" type="ax23:Properties"/>
->>>>>>> 977bf

<TRUNCATED>

Reply via email to