You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/05/14 12:45:59 UTC
[01/11] stratos git commit: Adding api method for updating cartridge
group
Repository: stratos
Updated Branches:
refs/heads/master 0bc077715 -> 390e4ff43
http://git-wip-us.apache.org/repos/asf/stratos/blob/6cddb02d/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 870f7a7..e8a2ac5 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,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ax29="http://rmi.java/xsd" xmlns:ns="http://impl.services.autoscaler.stratos.apache.org" xmlns:ax25="http://common.stratos.apache.org/xsd" xmlns:ax23="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax24="http://partition.common.stratos.apache.org/xsd" xmlns:ax21="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax217="http://application.exception.autoscaler.stratos.apache.org/xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ax215="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ax220="http://pojo.applications.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:ax223="http://pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax210="http://io.java/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">
+<?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">
<wsdl:types>
- <xs:schema xmlns:ax211="http://io.java/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://rmi.java/xsd">
+ <xs:schema xmlns:ax224="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="ax210:IOException">
+ <xs:extension base="ax223: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"/>
@@ -21,7 +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"/>
- <xs:element minOccurs="0" name="loadThresholds" nillable="true" type="ax21:LoadThresholds"/>
+ <xs:element minOccurs="0" name="loadThresholds" nillable="true" type="ax23:LoadThresholds"/>
<xs:element minOccurs="0" name="tenantId" type="xs:int"/>
</xs:sequence>
</xs:complexType>
@@ -33,17 +33,17 @@
</xs:sequence>
</xs:complexType>
</xs:schema>
- <xs:schema xmlns:ax221="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd">
+ <xs:schema xmlns:ax212="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"/>
- <xs:element minOccurs="0" name="components" nillable="true" type="ax220:ComponentContext"/>
+ <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="ax25:Properties"/>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax27: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"/>
@@ -52,10 +52,10 @@
</xs:complexType>
<xs:complexType name="ComponentContext">
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="applicationClusterContexts" nillable="true" type="ax220:ApplicationClusterContext"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax220:CartridgeContext"/>
- <xs:element minOccurs="0" name="dependencyContext" nillable="true" type="ax220:DependencyContext"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax220:GroupContext"/>
+ <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:sequence>
</xs:complexType>
<xs:complexType name="ApplicationClusterContext">
@@ -66,8 +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"/>
- <xs:element minOccurs="0" name="persistenceContext" nillable="true" type="ax220:PersistenceContext"/>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/>
+ <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="tenantRange" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="textPayload" nillable="true" type="xs:string"/>
</xs:sequence>
@@ -75,7 +75,7 @@
<xs:complexType name="PersistenceContext">
<xs:sequence>
<xs:element minOccurs="0" name="persistenceRequired" type="xs:boolean"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax220:VolumeContext"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax211:VolumeContext"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="VolumeContext">
@@ -94,21 +94,21 @@
<xs:sequence>
<xs:element minOccurs="0" name="cartridgeMax" type="xs:int"/>
<xs:element minOccurs="0" name="cartridgeMin" type="xs:int"/>
- <xs:element minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax220:SubscribableInfoContext"/>
+ <xs:element minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax211: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"/>
- <xs:element minOccurs="0" name="artifactRepositoryContext" nillable="true" type="ax220:ArtifactRepositoryContext"/>
+ <xs:element minOccurs="0" name="artifactRepositoryContext" nillable="true" type="ax211: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"/>
- <xs:element minOccurs="0" name="persistenceContext" nillable="true" type="ax220:PersistenceContext"/>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/>
+ <xs:element minOccurs="0" name="persistenceContext" nillable="true" type="ax211:PersistenceContext"/>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax27:Properties"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="ArtifactRepositoryContext">
@@ -130,9 +130,9 @@
<xs:complexType name="GroupContext">
<xs:sequence>
<xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax220:CartridgeContext"/>
+ <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="ax220:GroupContext"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax211: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"/>
@@ -143,8 +143,8 @@
<xs:complexType name="ServiceGroup">
<xs:sequence>
<xs:element maxOccurs="unbounded" minOccurs="0" name="cartridges" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax223:Dependencies"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="groups" nillable="true" type="ax223:ServiceGroup"/>
+ <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="name" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
@@ -156,564 +156,578 @@
</xs:sequence>
</xs:complexType>
</xs:schema>
- <xs:schema xmlns:ax28="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax216="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ax22="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax218="http://application.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax214="http://policy.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax212="http://rmi.java/xsd" xmlns:ax222="http://pojo.applications.autoscaler.stratos.apache.org/xsd" xmlns:ax224="http://pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax226="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.autoscaler.stratos.apache.org">
+ <xs:schema xmlns: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: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.applications.autoscaler.stratos.apache.org/xsd"/>
- <xs:import namespace="http://pojo.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:element name="getAutoscalingPolicy">
+ <xs:import namespace="http://rmi.java/xsd"/>
+ <xs:element name="getServiceGroup">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="autoscalingPolicyId" 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="getAutoscalingPolicyResponse">
+ <xs:element name="getServiceGroupResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax21:AutoscalePolicy"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax21:ServiceGroup"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getDeploymentPolicy">
+ <xs:element name="getAutoscalingPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="autoscalingPolicyId" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getDeploymentPolicyResponse">
+ <xs:element name="getAutoscalingPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax28:DeploymentPolicy"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax23:AutoscalePolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getDeploymentPolicies">
+ <xs:element name="getDeploymentPolicy">
<xs:complexType>
- <xs:sequence/>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/>
+ </xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getDeploymentPoliciesResponse">
+ <xs:element name="getDeploymentPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax28:DeploymentPolicy"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax25:DeploymentPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceRemoteException">
+ <xs:element name="getApplication">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="RemoteException" nillable="true" type="ax29:RemoteException"/>
+ <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceInvalidDeploymentPolicyException">
+ <xs:element name="getApplicationResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="InvalidDeploymentPolicyException" nillable="true" type="ax214:InvalidDeploymentPolicyException"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax213:ApplicationContext"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceDeploymentPolicyNotExistsException">
+ <xs:element name="AutoscalerServiceApplicationDefinitionException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="DeploymentPolicyNotExistsException" nillable="true" type="ax214:DeploymentPolicyNotExistsException"/>
+ <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax214:ApplicationDefinitionException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceInvalidPolicyException">
+ <xs:element name="updateApplication">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax214:InvalidPolicyException"/>
+ <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax213:ApplicationContext"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceCloudControllerConnectionException">
+ <xs:element name="updateApplicationResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="CloudControllerConnectionException" nillable="true" type="ax216:CloudControllerConnectionException"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateDeploymentPolicy">
+ <xs:element name="deleteApplication">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax28:DeploymentPolicy"/>
+ <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateDeploymentPolicyResponse">
+ <xs:element name="deleteApplicationResponse">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceInvalidApplicationPolicyException">
+ <xs:element name="AutoscalerServiceAutoScalingPolicyAlreadyExistException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="InvalidApplicationPolicyException" nillable="true" type="ax217:InvalidApplicationPolicyException"/>
+ <xs:element minOccurs="0" name="AutoScalingPolicyAlreadyExistException" nillable="true" type="ax217:AutoScalingPolicyAlreadyExistException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addApplicationPolicy">
+ <xs:element name="addAutoScalingPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax28:ApplicationPolicy"/>
+ <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax23:AutoscalePolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addApplicationPolicyResponse">
+ <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="removeApplicationPolicy">
+ <xs:element name="getAutoScalingPolicies">
<xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/>
- </xs:sequence>
+ <xs:sequence/>
</xs:complexType>
</xs:element>
- <xs:element name="removeApplicationPolicyResponse">
+ <xs:element name="getAutoScalingPoliciesResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax23:AutoscalePolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceApplicatioinPolicyNotExistsException">
+ <xs:element name="AutoscalerServiceInvalidPolicyException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="ApplicatioinPolicyNotExistsException" nillable="true" type="ax214:ApplicatioinPolicyNotExistsException"/>
+ <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax219:InvalidPolicyException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateApplicationPolicy">
+ <xs:element name="updateAutoScalingPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax28:ApplicationPolicy"/>
+ <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax23:AutoscalePolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateApplicationPolicyResponse">
+ <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="getApplicationPolicies">
+ <xs:element name="AutoscalerServiceUnremovablePolicyException">
<xs:complexType>
- <xs:sequence/>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="UnremovablePolicyException" nillable="true" type="ax219:UnremovablePolicyException"/>
+ </xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationPoliciesResponse">
+ <xs:element name="AutoscalerServicePolicyDoesNotExistException">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax28:ApplicationPolicy"/>
+ <xs:element minOccurs="0" name="PolicyDoesNotExistException" nillable="true" type="ax219:PolicyDoesNotExistException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplications">
+ <xs:element name="removeAutoScalingPolicy">
<xs:complexType>
- <xs:sequence/>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="autoscalePolicyId" nillable="true" type="xs:string"/>
+ </xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationsResponse">
+ <xs:element name="removeAutoScalingPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax220:ApplicationContext"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplication">
+ <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="getApplicationResponse">
+ <xs:element name="existApplicationResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax220:ApplicationContext"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="serviceGroupExist">
+ <xs:element name="deployApplication">
<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="applicationPolicyId" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="serviceGroupExistResponse">
+ <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="AutoscalerServiceAutoScalerException">
+ <xs:element name="undeployApplication">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="AutoScalerException" nillable="true" type="ax216:AutoScalerException"/>
+ <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="getServiceGroups">
- <xs:complexType>
- <xs:sequence/>
- </xs:complexType>
- </xs:element>
- <xs:element name="getServiceGroupsResponse">
+ <xs:element name="undeployApplicationResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax223:ServiceGroup"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceCartridgeGroupNotFoundException">
+ <xs:element name="AutoscalerServiceInvalidArgumentException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="CartridgeGroupNotFoundException" nillable="true" type="ax216:CartridgeGroupNotFoundException"/>
+ <xs:element minOccurs="0" name="InvalidArgumentException" nillable="true" type="ax217:InvalidArgumentException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="removeServiceGroup">
+ <xs:element name="updateClusterMonitor">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="groupName" nillable="true" type="xs:string"/>
+ <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="removeServiceGroupResponse">
+ <xs:element name="updateClusterMonitorResponse">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationPolicy">
+ <xs:element name="AutoscalerServiceInvalidServiceGroupException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax214:InvalidServiceGroupException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationPolicyResponse">
+ <xs:element name="addServiceGroup">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax28:ApplicationPolicy"/>
+ <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax21:ServiceGroup"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceApplicationDefinitionException">
+ <xs:element name="addServiceGroupResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax217:ApplicationDefinitionException"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addApplication">
+ <xs:element name="findClusterId">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax220:ApplicationContext"/>
+ <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="addApplicationResponse">
+ <xs:element name="findClusterIdResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getServiceGroup">
+ <xs:element name="AutoscalerServiceAutoScalerException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="AutoScalerException" nillable="true" type="ax217:AutoScalerException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getServiceGroupResponse">
+ <xs:element name="getApplicationNetworkPartitions">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax223:ServiceGroup"/>
+ <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateApplication">
+ <xs:element name="getApplicationNetworkPartitionsResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax220:ApplicationContext"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateApplicationResponse">
+ <xs:element name="AutoscalerServiceRemoteException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="RemoteException" nillable="true" type="ax222:RemoteException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="deleteApplication">
+ <xs:element name="AutoscalerServiceInvalidDeploymentPolicyException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="InvalidDeploymentPolicyException" nillable="true" type="ax219:InvalidDeploymentPolicyException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="deleteApplicationResponse">
+ <xs:element name="AutoscalerServiceDeploymentPolicyAlreadyExistsException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="DeploymentPolicyAlreadyExistsException" nillable="true" type="ax219:DeploymentPolicyAlreadyExistsException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceAutoScalingPolicyAlreadyExistException">
+ <xs:element name="addDeployementPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="AutoScalingPolicyAlreadyExistException" nillable="true" type="ax216:AutoScalingPolicyAlreadyExistException"/>
+ <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax25:DeploymentPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addAutoScalingPolicy">
+ <xs:element name="addDeployementPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax21:AutoscalePolicy"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addAutoScalingPolicyResponse">
+ <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="ax219:DeploymentPolicyNotExistsException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getAutoScalingPolicies">
+ <xs:element name="removeDeployementPolicy">
<xs:complexType>
- <xs:sequence/>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/>
+ </xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getAutoScalingPoliciesResponse">
+ <xs:element name="removeDeployementPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax21:AutoscalePolicy"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateAutoScalingPolicy">
+ <xs:element name="undeployServiceGroup">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax21:AutoscalePolicy"/>
+ <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateAutoScalingPolicyResponse">
+ <xs:element name="undeployServiceGroupResponse">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceUnremovablePolicyException">
+ <xs:element name="getApplicationPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="UnremovablePolicyException" nillable="true" type="ax214:UnremovablePolicyException"/>
+ <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServicePolicyDoesNotExistException">
+ <xs:element name="getApplicationPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="PolicyDoesNotExistException" nillable="true" type="ax214:PolicyDoesNotExistException"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax25:ApplicationPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="removeAutoScalingPolicy">
+ <xs:element name="getApplications">
<xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="autoscalePolicyId" nillable="true" type="xs:string"/>
- </xs:sequence>
+ <xs:sequence/>
</xs:complexType>
</xs:element>
- <xs:element name="removeAutoScalingPolicyResponse">
+ <xs:element name="getApplicationsResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax213:ApplicationContext"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="existApplication">
+ <xs:element name="addApplication">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax213:ApplicationContext"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="existApplicationResponse">
+ <xs:element name="addApplicationResponse">
<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="getDeploymentPolicies">
+ <xs:complexType>
+ <xs:sequence/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getDeploymentPoliciesResponse">
<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 maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax25:DeploymentPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="deployApplicationResponse">
+ <xs:element name="AutoscalerServiceCloudControllerConnectionException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="CloudControllerConnectionException" nillable="true" type="ax217:CloudControllerConnectionException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="undeployApplication">
+ <xs:element name="updateDeploymentPolicy">
<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:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax25:DeploymentPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="undeployApplicationResponse">
+ <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="AutoscalerServiceInvalidArgumentException">
+ <xs:element name="AutoscalerServiceInvalidApplicationPolicyException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="InvalidArgumentException" nillable="true" type="ax216:InvalidArgumentException"/>
+ <xs:element minOccurs="0" name="InvalidApplicationPolicyException" nillable="true" type="ax214:InvalidApplicationPolicyException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateClusterMonitor">
+ <xs:element name="addApplicationPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/>
+ <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax25:ApplicationPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateClusterMonitorResponse">
+ <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="AutoscalerServiceInvalidServiceGroupException">
+ <xs:element name="removeApplicationPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax217:InvalidServiceGroupException"/>
+ <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addServiceGroup">
+ <xs:element name="removeApplicationPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax223:ServiceGroup"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addServiceGroupResponse">
+ <xs:element name="AutoscalerServiceApplicatioinPolicyNotExistsException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="ApplicatioinPolicyNotExistsException" nillable="true" type="ax219:ApplicatioinPolicyNotExistsException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="findClusterId">
+ <xs:element name="updateApplicationPolicy">
<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:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax25:ApplicationPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="findClusterIdResponse">
+ <xs:element name="updateApplicationPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationNetworkPartitions">
+ <xs:element name="getApplicationPolicies">
+ <xs:complexType>
+ <xs:sequence/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getApplicationPoliciesResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax25:ApplicationPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationNetworkPartitionsResponse">
+ <xs:element name="updateServiceGroup">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="cartridgeGroup" nillable="true" type="ax21:ServiceGroup"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceDeploymentPolicyAlreadyExistsException">
+ <xs:element name="updateServiceGroupResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="DeploymentPolicyAlreadyExistsException" nillable="true" type="ax214:DeploymentPolicyAlreadyExistsException"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addDeployementPolicy">
+ <xs:element name="serviceGroupExist">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax28:DeploymentPolicy"/>
+ <xs:element minOccurs="0" name="serviceName" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addDeployementPolicyResponse">
+ <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="removeDeployementPolicy">
+ <xs:element name="getServiceGroups">
+ <xs:complexType>
+ <xs:sequence/>
+ </xs:complexType>
+ </xs:element>
+ <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="ax21: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="ax217: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"/>
@@ -721,13 +735,13 @@
</xs:complexType>
</xs:element>
</xs:schema>
- <xs:schema xmlns:ax27="http://partition.common.stratos.apache.org/xsd" xmlns:ax219="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd">
+ <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:import namespace="http://partition.common.stratos.apache.org/xsd"/>
<xs:import namespace="http://common.stratos.apache.org/xsd"/>
<xs:complexType name="DeploymentPolicy">
<xs:sequence>
<xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitions" nillable="true" type="ax27:NetworkPartition"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitions" nillable="true" type="ax29:NetworkPartition"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="ApplicationPolicy">
@@ -736,18 +750,18 @@
<xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/>
<xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionGroups" nillable="true" type="xs:string"/>
<xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitions" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax27:Properties"/>
</xs:sequence>
</xs:complexType>
</xs:schema>
- <xs:schema xmlns:ax26="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.common.stratos.apache.org/xsd">
+ <xs:schema xmlns:ax28="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="NetworkPartition">
<xs:sequence>
<xs:element minOccurs="0" name="activeByDefault" type="xs:boolean"/>
<xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="partitionAlgo" nillable="true" type="xs:string"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax24:Partition"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax26:Partition"/>
<xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
@@ -758,23 +772,23 @@
<xs:element minOccurs="0" name="isPublic" type="xs:boolean"/>
<xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="partitionMax" type="xs:int"/>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax27:Properties"/>
<xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:schema>
<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://application.exception.autoscaler.stratos.apache.org/xsd">
- <xs:complexType name="InvalidApplicationPolicyException">
+ <xs:complexType name="ApplicationDefinitionException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="ApplicationDefinitionException">
+ <xs:complexType name="InvalidServiceGroupException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="InvalidServiceGroupException">
+ <xs:complexType name="InvalidApplicationPolicyException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
</xs:sequence>
@@ -783,7 +797,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="ax25:Property"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax27:Property"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="Property">
@@ -793,41 +807,41 @@
</xs:sequence>
</xs:complexType>
</xs:schema>
- <xs:schema xmlns:ax225="http://exception.autoscaler.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://policy.exception.autoscaler.stratos.apache.org/xsd">
+ <xs:schema xmlns:ax220="http://exception.autoscaler.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://policy.exception.autoscaler.stratos.apache.org/xsd">
<xs:import namespace="http://exception.autoscaler.stratos.apache.org/xsd"/>
- <xs:complexType name="InvalidDeploymentPolicyException">
- <xs:sequence/>
- </xs:complexType>
- <xs:complexType name="DeploymentPolicyNotExistsException">
- <xs:sequence/>
- </xs:complexType>
<xs:complexType name="InvalidPolicyException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="ApplicatioinPolicyNotExistsException">
- <xs:sequence>
- <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
<xs:complexType name="UnremovablePolicyException">
<xs:complexContent>
- <xs:extension base="ax215:AutoScalerException">
+ <xs:extension base="ax216:AutoScalerException">
<xs:sequence/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="PolicyDoesNotExistException">
<xs:complexContent>
- <xs:extension base="ax215:AutoScalerException">
+ <xs:extension base="ax216:AutoScalerException">
<xs:sequence/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
+ <xs:complexType name="InvalidDeploymentPolicyException">
+ <xs:sequence/>
+ </xs:complexType>
<xs:complexType name="DeploymentPolicyAlreadyExistsException">
<xs:sequence/>
</xs:complexType>
+ <xs:complexType name="DeploymentPolicyNotExistsException">
+ <xs:sequence/>
+ </xs:complexType>
+ <xs:complexType name="ApplicatioinPolicyNotExistsException">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
</xs:schema>
<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://io.java/xsd">
<xs:complexType name="IOException">
@@ -835,7 +849,7 @@
</xs:complexType>
</xs:schema>
<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://exception.autoscaler.stratos.apache.org/xsd">
- <xs:complexType name="CloudControllerConnectionException">
+ <xs:complexType name="AutoScalingPolicyAlreadyExistException">
<xs:sequence/>
</xs:complexType>
<xs:complexType name="AutoScalerException">
@@ -845,17 +859,17 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="CartridgeGroupNotFoundException">
- <xs:sequence/>
- </xs:complexType>
- <xs:complexType name="AutoScalingPolicyAlreadyExistException">
- <xs:sequence/>
- </xs:complexType>
<xs:complexType name="InvalidArgumentException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
+ <xs:complexType name="CloudControllerConnectionException">
+ <xs:sequence/>
+ </xs:complexType>
+ <xs:complexType name="CartridgeGroupNotFoundException">
+ <xs:sequence/>
+ </xs:complexType>
</xs:schema>
</wsdl:types>
<wsdl:message name="removeAutoScalingPolicyRequest">
@@ -915,6 +929,15 @@
<wsdl:message name="getApplicationResponse">
<wsdl:part name="parameters" element="ns:getApplicationResponse"/>
</wsdl:message>
+ <wsdl:message name="updateServiceGroupRequest">
+ <wsdl:part name="parameters" element="ns:updateServiceGroup"/>
+ </wsdl:message>
+ <wsdl:message name="updateServiceGroupResponse">
+ <wsdl:part name="parameters" element="ns:updateServiceGroupResponse"/>
+ </wsdl:message>
+ <wsdl:message name="AutoscalerServiceInvalidServiceGroupException">
+ <wsdl:part name="parameters" element="ns:AutoscalerServiceInvalidServiceGroupException"/>
+ </wsdl:message>
<wsdl:message name="deployApplicationRequest">
<wsdl:part name="parameters" element="ns:deployApplication"/>
</wsdl:message>
@@ -978,9 +1001,6 @@
<wsdl:message name="addServiceGroupResponse">
<wsdl:part name="parameters" element="ns:addServiceGroupResponse"/>
</wsdl:message>
- <wsdl:message name="AutoscalerServiceInvalidServiceGroupException">
- <wsdl:part name="parameters" element="ns:AutoscalerServiceInvalidServiceGroupException"/>
- </wsdl:message>
<wsdl:message name="existApplicationRequest">
<wsdl:part name="parameters" element="ns:existApplication"/>
</wsdl:message>
@@ -1086,18 +1106,18 @@
<wsdl:message name="AutoscalerServiceCartridgeGroupNotFoundException">
<wsdl:part name="parameters" element="ns:AutoscalerServiceCartridgeGroupNotFoundException"/>
</wsdl:message>
- <wsdl:message name="updateApplicationRequest">
- <wsdl:part name="parameters" element="ns:updateApplication"/>
- </wsdl:message>
- <wsdl:message name="updateApplicationResponse">
- <wsdl:part name="parameters" element="ns:updateApplicationResponse"/>
- </wsdl:message>
<wsdl:message name="getApplicationPolicyRequest">
<wsdl:part name="parameters" element="ns:getApplicationPolicy"/>
</wsdl:message>
<wsdl:message name="getApplicationPolicyResponse">
<wsdl:part name="parameters" element="ns:getApplicationPolicyResponse"/>
</wsdl:message>
+ <wsdl:message name="updateApplicationRequest">
+ <wsdl:part name="parameters" element="ns:updateApplication"/>
+ </wsdl:message>
+ <wsdl:message name="updateApplicationResponse">
+ <wsdl:part name="parameters" element="ns:updateApplicationResponse"/>
+ </wsdl:message>
<wsdl:portType name="AutoscalerServicePortType">
<wsdl:operation name="removeAutoScalingPolicy">
<wsdl:input message="ns:removeAutoScalingPolicyRequest" wsaw:Action="urn:removeAutoScalingPolicy"/>
@@ -1132,6 +1152,11 @@
<wsdl:input message="ns:getApplicationRequest" wsaw:Action="urn:getApplication"/>
<wsdl:output message="ns:getApplicationResponse" wsaw:Action="urn:getApplicationResponse"/>
</wsdl:operation>
+ <wsdl:operation name="updateServiceGroup">
+ <wsdl:input message="ns:updateServiceGroupRequest" wsaw:Action="urn:updateServiceGroup"/>
+ <wsdl:output message="ns:updateServiceGroupResponse" wsaw:Action="urn:updateServiceGroupResponse"/>
+ <wsdl:fault message="ns:AutoscalerServiceInvalidServiceGroupException" name="AutoscalerServiceInvalidServiceGroupException" wsaw:Action="urn:updateServiceGroupAutoscalerServiceInvalidServiceGroupException"/>
+ </wsdl:operation>
<wsdl:operation name="deployApplication">
<wsdl:input message="ns:deployApplicationRequest" wsaw:Action="urn:deployApplication"/>
<wsdl:output message="ns:deployApplicationResponse" wsaw:Action="urn:deployApplicationResponse"/>
@@ -1246,15 +1271,15 @@
<wsdl:output message="ns:removeServiceGroupResponse" wsaw:Action="urn:removeServiceGroupResponse"/>
<wsdl:fault message="ns:AutoscalerServiceCartridgeGroupNotFoundException" name="AutoscalerServiceCartridgeGroupNotFoundException" wsaw:Action="urn:removeServiceGroupAutoscalerServiceCartridgeGroupNotFoundException"/>
</wsdl:operation>
+ <wsdl:operation name="getApplicationPolicy">
+ <wsdl:input message="ns:getApplicationPolicyRequest" wsaw:Action="urn:getApplicationPolicy"/>
+ <wsdl:output message="ns:getApplicationPolicyResponse" wsaw:Action="urn:getApplicationPolicyResponse"/>
+ </wsdl:operation>
<wsdl:operation name="updateApplication">
<wsdl:input message="ns:updateApplicationRequest" wsaw:Action="urn:updateApplication"/>
<wsdl:output message="ns:updateApplicationResponse" wsaw:Action="urn:updateApplicationResponse"/>
<wsdl:fault message="ns:AutoscalerServiceApplicationDefinitionException" name="AutoscalerServiceApplicationDefinitionException" wsaw:Action="urn:updateApplicationAutoscalerServiceApplicationDefinitionException"/>
</wsdl:operation>
- <wsdl:operation name="getApplicationPolicy">
- <wsdl:input message="ns:getApplicationPolicyRequest" wsaw:Action="urn:getApplicationPolicy"/>
- <wsdl:output message="ns:getApplicationPolicyResponse" wsaw:Action="urn:getApplicationPolicyResponse"/>
- </wsdl:operation>
</wsdl:portType>
<wsdl:binding name="AutoscalerServiceSoap11Binding" type="ns:AutoscalerServicePortType">
<soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
@@ -1336,6 +1361,18 @@
<soap:body use="literal"/>
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="updateServiceGroup">
+ <soap:operation soapAction="urn:updateServiceGroup" style="document"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="AutoscalerServiceInvalidServiceGroupException">
+ <soap:fault use="literal" name="AutoscalerServiceInvalidServiceGroupException"/>
+ </wsdl:fault>
+ </wsdl:operation>
<wsdl:operation name="deployApplication">
<soap:operation soapAction="urn:deployApplication" style="document"/>
<wsdl:input>
@@ -1609,26 +1646,26 @@
<soap:fault use="literal" name="AutoscalerServiceCartridgeGroupNotFoundException"/>
</wsdl:fault>
</wsdl:operation>
- <wsdl:operation name="getApplicationPolicy">
- <soap:operation soapAction="urn:getApplicationPolicy" style="document"/>
+ <wsdl:operation name="updateApplication">
+ <soap:operation soapAction="urn:updateApplication" style="document"/>
<wsdl:input>
<soap:body use="literal"/>
</wsdl:input>
<wsdl:output>
<soap:body use="literal"/>
</wsdl:output>
+ <wsdl:fault name="AutoscalerServiceApplicationDefinitionException">
+ <soap:fault use="literal" name="AutoscalerServiceApplicationDefinitionException"/>
+ </wsdl:fault>
</wsdl:operation>
- <wsdl:operation name="updateApplication">
- <soap:operation soapAction="urn:updateApplication" style="document"/>
+ <wsdl:operation name="getApplicationPolicy">
+ <soap:operation soapAction="urn:getApplicationPolicy" style="document"/>
<wsdl:input>
<soap:body use="literal"/>
</wsdl:input>
<wsdl:output>
<soap:body use="literal"/>
</wsdl:output>
- <wsdl:fault name="AutoscalerServiceApplicationDefinitionException">
- <soap:fault use="literal" name="AutoscalerServiceApplicationDefinitionException"/>
- </wsdl:fault>
</wsdl:operation>
</wsdl:binding>
<wsdl:binding name="AutoscalerServiceSoap12Binding" type="ns:AutoscalerServicePortType">
@@ -1711,6 +1748,18 @@
<soap12:body use="literal"/>
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="updateServiceGroup">
+ <soap12:operation soapAction="urn:updateServiceGroup" style="document"/>
+ <wsdl:input>
+ <soap12:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="AutoscalerServiceInvalidServiceGroupException">
+ <soap12:fault use="literal" name="AutoscalerServiceInvalidServiceGroupException"/>
+ </wsdl:fault>
+ </wsdl:operation>
<wsdl:operation name="deployApplication">
<soap12:operation soapAction="urn:deployApplication" style="document"/>
<wsdl:input>
@@ -1984,26 +2033,26 @@
<soap12:fault use="literal" name="AutoscalerServiceCartridgeGroupNotFoundException"/>
</wsdl:fault>
</wsdl:operation>
- <wsdl:operation name="getApplicationPolicy">
- <soap12:operation soapAction="urn:getApplicationPolicy" style="document"/>
+ <wsdl:operation name="updateApplication">
+ <soap12:operation soapAction="urn:updateApplication" style="document"/>
<wsdl:input>
<soap12:body use="literal"/>
</wsdl:input>
<wsdl:output>
<soap12:body use="literal"/>
</wsdl:output>
+ <wsdl:fault name="AutoscalerServiceApplicationDefinitionException">
+ <soap12:fault use="literal" name="AutoscalerServiceApplicationDefinitionException"/>
+ </wsdl:fault>
</wsdl:operation>
- <wsdl:operation name="updateApplication">
- <soap12:operation soapAction="urn:updateApplication" style="document"/>
+ <wsdl:operation name="getApplicationPolicy">
+ <soap12:operation soapAction="urn:getApplicationPolicy" style="document"/>
<wsdl:input>
<soap12:body use="literal"/>
</wsdl:input>
<wsdl:output>
<soap12:body use="literal"/>
</wsdl:output>
- <wsdl:fault name="AutoscalerServiceApplicationDefinitionException">
- <soap12:fault use="literal" name="AutoscalerServiceApplicationDefinitionException"/>
- </wsdl:fault>
</wsdl:operation>
</wsdl:binding>
<wsdl:binding name="AutoscalerServiceHttpBinding" type="ns:AutoscalerServicePortType">
@@ -2071,6 +2120,15 @@
<mime:content type="text/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="updateServiceGroup">
+ <http:operation location="updateServiceGroup"/>
+ <wsdl:input>
+ <mime:content type="text/xml" part="parameters"/>
+ </wsdl:input>
+ <wsdl:output>
+ <mime:content type="text/xml" part="parameters"/>
+ </wsdl:output>
+ </wsdl:operation>
<wsdl:operation name="deployApplication">
<http:operation location="deployApplication"/>
<wsdl:input>
@@ -2278,8 +2336,8 @@
<mime:content type="text/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="getApplicationPolicy">
- <http:operation location="getApplicationPolicy"/>
+ <wsdl:operation name="updateApplication">
+ <http:operation location="updateApplication"/>
<wsdl:input>
<mime:content type="text/xml" part="parameters"/>
</wsdl:input>
@@ -2287,8 +2345,8 @@
<mime:content type="text/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="updateApplication">
- <http:operation location="updateApplication"/>
+ <wsdl:operation name="getApplicationPolicy">
+ <http:operation location="getApplicationPolicy"/>
<wsdl:input>
<mime:content type="text/xml" part="parameters"/>
</wsdl:input>
[05/11] stratos git commit: resolving merge conflicts
Posted by im...@apache.org.
resolving merge conflicts
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/00847097
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/00847097
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/00847097
Branch: refs/heads/master
Commit: 008470977d46b7c4219ef81ac44d7def3d5de35f
Parents: eb656c1 977bf94
Author: Vishanth <vi...@gmail.com>
Authored: Thu May 14 11:51:10 2015 +0530
Committer: Vishanth <vi...@gmail.com>
Committed: Thu May 14 11:51:10 2015 +0530
----------------------------------------------------------------------
.../applications/topic/ApplicationBuilder.java | 2 -
.../client/CloudControllerClient.java | 4 +-
.../context/cluster/ClusterContext.java | 46 +-
.../partition/ClusterLevelPartitionContext.java | 4 +-
.../context/partition/PartitionContext.java | 10 +-
.../internal/AutoscalerServiceComponent.java | 24 +-
.../autoscaler/monitor/MonitorFactory.java | 18 +-
.../monitor/component/GroupMonitor.java | 44 +-
.../policy/deployment/DeploymentPolicy.java | 36 +-
.../autoscaler/rule/RuleTasksDelegator.java | 6 +
.../services/impl/AutoscalerServiceImpl.java | 56 +-
.../util/AutoscalerObjectConverter.java | 128 +---
.../stratos/autoscaler/util/AutoscalerUtil.java | 4 +-
.../CloudControllerServiceComponent.java | 24 +-
.../impl/CloudControllerServiceImpl.java | 7 +-
.../ComponentStartUpSynchronizerImpl.java | 72 ++-
.../common/partition/NetworkPartition.java | 102 ----
.../common/partition/NetworkPartitionRef.java | 84 +++
.../stratos/common/partition/Partition.java | 151 -----
.../stratos/common/partition/PartitionRef.java | 124 ++++
.../services/ComponentStartUpSynchronizer.java | 2 +
.../StratosManagerServiceComponent.java | 30 +-
.../rest/endpoint/api/StratosApiV41Utils.java | 39 +-
.../util/converter/ObjectConverter.java | 44 +-
.../modules/distribution/src/bin/stratos.bat | 2 +-
.../modules/distribution/src/bin/stratos.sh | 1 +
.../src/main/conf/drools/scaling.drl | 4 +-
.../single-cartridge-app/scripts/gce/deploy.sh | 9 +
.../scripts/gce/undeploy.sh | 7 +
.../src/main/resources/AutoscalerService.wsdl | 611 ++++++++++++++++++-
30 files changed, 1105 insertions(+), 590 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/00847097/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/00847097/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/00847097/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoscalerService.wsdl
----------------------------------------------------------------------
diff --cc service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoscalerService.wsdl
index e8a2ac5,6df34ae..036ccb2
--- 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,10 -1,10 +1,20 @@@
++<<<<<<< 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.a
utoscaler.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:ax224="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.a
utoscaler.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:sequence>
<xs:element minOccurs="0" name="cause" nillable="true" type="xs:anyType"/>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
@@@ -21,7 -21,7 +31,11 @@@
<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="tenantId" type="xs:int"/>
</xs:sequence>
</xs:complexType>
@@@ -33,17 -33,17 +47,29 @@@
</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: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="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="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"/>
@@@ -52,10 -52,10 +78,17 @@@
</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:sequence>
</xs:complexType>
<xs:complexType name="ApplicationClusterContext">
@@@ -66,8 -66,8 +99,13 @@@
<xs:element maxOccurs="unbounded" minOccurs="0" name="dependencyClusterIds" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="deploymentPolicyName" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="persistenceContext" nillable="true" type="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="tenantRange" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="textPayload" nillable="true" type="xs:string"/>
</xs:sequence>
@@@ -75,7 -75,7 +113,11 @@@
<xs:complexType name="PersistenceContext">
<xs:sequence>
<xs:element minOccurs="0" name="persistenceRequired" type="xs:boolean"/>
++<<<<<<< HEAD
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax211:VolumeContext"/>
++=======
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax224:VolumeContext"/>
++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
</xs:sequence>
</xs:complexType>
<xs:complexType name="VolumeContext">
@@@ -94,21 -94,21 +136,34 @@@
<xs:sequence>
<xs:element minOccurs="0" name="cartridgeMax" type="xs:int"/>
<xs:element minOccurs="0" name="cartridgeMin" type="xs:int"/>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax211:SubscribableInfoContext"/>
++=======
+ <xs:element minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax224:SubscribableInfoContext"/>
++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
<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="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:sequence>
</xs:complexType>
<xs:complexType name="ArtifactRepositoryContext">
@@@ -130,9 -130,9 +185,15 @@@
<xs:complexType name="GroupContext">
<xs:sequence>
<xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"/>
++<<<<<<< HEAD
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="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 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 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"/>
@@@ -143,8 -143,8 +204,13 @@@
<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="name" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
@@@ -156,97 -156,67 +222,139 @@@
</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: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://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:complexType>
- <xs:sequence/>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/>
+ </xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getDeploymentPoliciesResponse">
+ <xs:element name="getDeploymentPolicyResponse">
<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:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceRemoteException">
+ <xs:element name="getApplication">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
++=======
+ <xs:element minOccurs="0" name="RemoteException" nillable="true" type="ax27:RemoteException"/>
++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceInvalidDeploymentPolicyException">
+ <xs:element name="getApplicationResponse">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax213:ApplicationContext"/>
++=======
+ <xs:element minOccurs="0" name="InvalidDeploymentPolicyException" nillable="true" type="ax212:InvalidDeploymentPolicyException"/>
++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceDeploymentPolicyNotExistsException">
+ <xs:element name="AutoscalerServiceApplicationDefinitionException">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax214:ApplicationDefinitionException"/>
++=======
+ <xs:element minOccurs="0" name="DeploymentPolicyNotExistsException" nillable="true" type="ax212:DeploymentPolicyNotExistsException"/>
++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceInvalidPolicyException">
+ <xs:element name="updateApplication">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax213:ApplicationContext"/>
++=======
+ <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax212:InvalidPolicyException"/>
++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceCloudControllerConnectionException">
+ <xs:element name="updateApplicationResponse">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
++=======
+ <xs:element minOccurs="0" name="CloudControllerConnectionException" nillable="true" type="ax214:CloudControllerConnectionException"/>
++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateDeploymentPolicy">
+ <xs:element name="deleteApplication">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
++=======
+ <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax26:DeploymentPolicy"/>
++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
</xs:sequence>
</xs:complexType>
</xs:element>
@@@ -257,17 -227,17 +365,25 @@@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceInvalidApplicationPolicyException">
+ <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="addApplicationPolicy">
+ <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>
@@@ -290,17 -262,17 +406,25 @@@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceApplicatioinPolicyNotExistsException">
+ <xs:element name="AutoscalerServiceInvalidPolicyException">
<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:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateApplicationPolicy">
+ <xs:element name="updateAutoScalingPolicy">
<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>
@@@ -311,437 -283,451 +435,832 @@@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationPolicies">
+ <xs:element name="AutoscalerServiceUnremovablePolicyException">
<xs:complexType>
- <xs:sequence/>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="UnremovablePolicyException" nillable="true" type="ax219:UnremovablePolicyException"/>
+ </xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationPoliciesResponse">
+ <xs:element name="AutoscalerServicePolicyDoesNotExistException">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="PolicyDoesNotExistException" nillable="true" type="ax219: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: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="applicationId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="AutoScalingPolicyAlreadyExistException" nillable="true" type="ax214:AutoScalingPolicyAlreadyExistException"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="addAutoScalingPolicy">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax219:AutoscalePolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
+ <xs:element name="addAutoScalingPolicyResponse">
++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
++<<<<<<< HEAD
+ <xs:element name="existApplicationResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="deployApplication">
+ <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: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:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax216:ApplicationDefinitionException"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="deployApplication">
+ <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">
++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
<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" type="xs:boolean"/>
+ <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: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:complexType>
+ </xs:element>
+ <xs:element name="updateClusterMonitorResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ </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:sequence>
+ </xs:complexType>
+ </xs:element>
++<<<<<<< HEAD
+ <xs:element name="addDeployementPolicy">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax25:DeploymentPolicy"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <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="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:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="removeDeployementPolicyResponse">
<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="return" type="xs:boolean"/>
+ <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:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getApplications">
+ <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:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="removeDeployementPolicyResponse">
+ <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:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getApplications">
+ <xs:complexType>
+ <xs:sequence/>
+ </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:sequence>
+ </xs:complexType>
+ </xs:element>
++<<<<<<< HEAD
+ <xs:element name="getDeploymentPolicies">
+ <xs:complexType>
+ <xs:sequence/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getDeploymentPoliciesResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax25:DeploymentPolicy"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="AutoscalerServiceCloudControllerConnectionException">
++=======
+ <xs:element name="addApplication">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax224:ApplicationContext"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="addApplicationResponse">
++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="CloudControllerConnectionException" nillable="true" type="ax217:CloudControllerConnectionException"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
++<<<<<<< HEAD
+ <xs:element name="updateDeploymentPolicy">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax25:DeploymentPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
+ <xs:element name="updateDeploymentPolicyResponse">
++=======
+ <xs:element name="getApplication">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getApplicationResponse">
++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax224:ApplicationContext"/>
</xs:sequence>
</xs:complexType>
</xs:element>
++<<<<<<< HEAD
+ <xs:element name="AutoscalerServiceInvalidApplicationPolicyException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="InvalidApplicationPolicyException" nillable="true" type="ax214:InvalidApplicationPolicyException"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="addApplicationPolicy">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax25:ApplicationPolicy"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="addApplicationPolicyResponse">
++=======
+ <xs:element name="updateApplication">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax224:ApplicationContext"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="updateApplicationResponse">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
+ <xs:element name="deleteApplication">
++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
++<<<<<<< HEAD
+ <xs:element name="removeApplicationPolicy">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="removeApplicationPolicyResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="AutoscalerServiceApplicatioinPolicyNotExistsException">
++=======
+ <xs:element name="deleteApplicationResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="serviceGroupExist">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="serviceName" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="serviceGroupExistResponse">
++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="ApplicatioinPolicyNotExistsException" nillable="true" type="ax219:ApplicatioinPolicyNotExistsException"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
++<<<<<<< HEAD
+ <xs:element name="updateApplicationPolicy">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax25:ApplicationPolicy"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="updateApplicationPolicyResponse">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
+ <xs:element name="getApplicationPolicies">
+ <xs:complexType>
+ <xs:sequence/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getApplicationPoliciesResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax25:ApplicationPolicy"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="updateServiceGroup">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="cartridgeGroup" nillable="true" type="ax21:ServiceGroup"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <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="serviceGroupExist">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="serviceName" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="serviceGroupExistResponse">
++=======
+ <xs:element name="getServiceGroups">
+ <xs:complexType>
+ <xs:sequence/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getServiceGroupsResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax222:ServiceGroup"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="AutoscalerServiceCartridgeGroupNotFoundException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="CartridgeGroupNotFoundException" nillable="true" type="ax214:CartridgeGroupNotFoundException"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="removeServiceGroup">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="groupName" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="removeServiceGroupResponse">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
+ <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="ax26:ApplicationPolicy"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getServiceGroup">
++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
++<<<<<<< HEAD
+ <xs:element name="getServiceGroups">
+ <xs:complexType>
+ <xs:sequence/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getServiceGroupsResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax21:ServiceGroup"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="AutoscalerServiceCartridgeGroupNotFoundException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="CartridgeGroupNotFoundException" nillable="true" type="ax217:CartridgeGroupNotFoundException"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="removeServiceGroup">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="groupName" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="removeServiceGroupResponse">
++=======
+ <xs:element name="getServiceGroupResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax222: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="ax219:AutoscalePolicy"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getDeploymentPolicy">
++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getDeploymentPolicyResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax26:DeploymentPolicy"/>
</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: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:complexType name="ApplicationPolicy">
@@@ -750,18 -736,17 +1269,29 @@@
<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: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: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:import namespace="http://common.stratos.apache.org/xsd"/>
- <xs:complexType name="NetworkPartition">
+ <xs:complexType name="NetworkPartitionRef">
<xs:sequence>
- <xs:element minOccurs="0" name="activeByDefault" type="xs:boolean"/>
<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:sequence>
</xs:complexType>
@@@ -769,11 -754,9 +1299,14 @@@
<xs:sequence>
<xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/>
<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"/>
++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
</xs:sequence>
</xs:complexType>
</xs:schema>
@@@ -797,7 -780,7 +1330,11 @@@
<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://common.stratos.apache.org/xsd">
<xs:complexType name="Properties">
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax27:Property"/>
++=======
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax23:Property"/>
++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
</xs:sequence>
</xs:complexType>
<xs:complexType name="Property">
@@@ -814,16 -803,21 +1351,24 @@@
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="ApplicatioinPolicyNotExistsException">
- <xs:sequence>
- <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
<xs:complexType name="UnremovablePolicyException">
<xs:complexContent>
++<<<<<<< HEAD
+ <xs:extension base="ax216:AutoScalerException">
++=======
+ <xs:extension base="ax220:AutoScalerException">
++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
<xs:sequence/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="PolicyDoesNotExistException">
<xs:complexContent>
++<<<<<<< HEAD
+ <xs:extension base="ax216:AutoScalerException">
++=======
+ <xs:extension base="ax220:AutoScalerException">
++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
<xs:sequence/>
</xs:extension>
</xs:complexContent>
@@@ -849,9 -832,12 +1394,12 @@@
</xs:complexType>
</xs:schema>
<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://exception.autoscaler.stratos.apache.org/xsd">
- <xs:complexType name="CloudControllerConnectionException">
+ <xs:complexType name="AutoScalingPolicyAlreadyExistException">
<xs:sequence/>
</xs:complexType>
+ <xs:complexType name="AutoScalingPolicyAlreadyExistException">
+ <xs:sequence/>
+ </xs:complexType>
<xs:complexType name="AutoScalerException">
<xs:complexContent>
<xs:extension base="xs:RuntimeException">
@@@ -864,9 -850,6 +1412,12 @@@
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
++<<<<<<< HEAD
+ <xs:complexType name="CloudControllerConnectionException">
+ <xs:sequence/>
+ </xs:complexType>
++=======
++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a
<xs:complexType name="CartridgeGroupNotFoundException">
<xs:sequence/>
</xs:complexType>
[07/11] stratos git commit: Resolving conflicts in wsdl
Posted by im...@apache.org.
Resolving conflicts in wsdl
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0a25877d
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0a25877d
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0a25877d
Branch: refs/heads/master
Commit: 0a25877d9b679f9ffecac4be9aa1e0c75cd52a2e
Parents: 0084709
Author: Vishanth <vi...@gmail.com>
Authored: Thu May 14 12:26:37 2015 +0530
Committer: Vishanth <vi...@gmail.com>
Committed: Thu May 14 12:26:37 2015 +0530
----------------------------------------------------------------------
.../src/main/resources/AutoscalerService.wsdl | 1020 ++++--------------
1 file changed, 233 insertions(+), 787 deletions(-)
----------------------------------------------------------------------
[04/11] stratos git commit: Fixes
Posted by im...@apache.org.
Fixes
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/eb656c1e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/eb656c1e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/eb656c1e
Branch: refs/heads/master
Commit: eb656c1ecf209f54ce291123f4dca3eb580792ae
Parents: 833f360
Author: Vishanth <vi...@gmail.com>
Authored: Thu May 14 10:31:21 2015 +0530
Committer: Vishanth <vi...@gmail.com>
Committed: Thu May 14 10:31:21 2015 +0530
----------------------------------------------------------------------
.../rest/endpoint/api/StratosApiV41Utils.java | 59 ++++++++++----------
1 file changed, 30 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/eb656c1e/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
index ab798c7..26cb87e 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
@@ -1101,44 +1101,45 @@ public class StratosApiV41Utils {
//validate the group definition to check for cyclic group behaviour
validateGroupDuplicationInGroupDefinition(cartridgeGroup);
- List<String> cartridgesBeforeUpdating = new ArrayList<String>();
- List<String> cartridgesAfterUpdating = new ArrayList<String>();
+ if (serviceGroup != null) {
+ autoscalerServiceClient.updateServiceGroup(
+ ObjectConverter.convertServiceGroupDefinitionToASStubServiceGroup(cartridgeGroup));
+
+ List<String> cartridgesBeforeUpdating = new ArrayList<String>();
+ List<String> cartridgesAfterUpdating = new ArrayList<String>();
- ServiceGroup serviceGroupToBeUpdated = autoscalerServiceClient.getServiceGroup(cartridgeGroup.getName());
- findCartridgesInServiceGroup(serviceGroupToBeUpdated, cartridgesBeforeUpdating);
- findCartridgesInGroupBean(cartridgeGroup, cartridgesAfterUpdating);
+ ServiceGroup serviceGroupToBeUpdated = autoscalerServiceClient.getServiceGroup(cartridgeGroup.getName());
+ findCartridgesInServiceGroup(serviceGroupToBeUpdated, cartridgesBeforeUpdating);
+ findCartridgesInGroupBean(cartridgeGroup, cartridgesAfterUpdating);
- List<String> cartridgesToRemove = cartridgesBeforeUpdating;
- List<String> cartridgesToAdd = cartridgesAfterUpdating;
- if ((cartridgesBeforeUpdating != null) || (!cartridgesBeforeUpdating.isEmpty()) ||
- (cartridgesAfterUpdating != null) || (!cartridgesAfterUpdating.isEmpty())) {
+ List<String> cartridgesToRemove = cartridgesBeforeUpdating;
+ List<String> cartridgesToAdd = cartridgesAfterUpdating;
- for (String before : cartridgesBeforeUpdating) {
- for (String after : cartridgesAfterUpdating) {
- if (before.equals(after)) {
- cartridgesToRemove.remove(after);
- cartridgesToAdd.remove(after);
+ if ((cartridgesBeforeUpdating != null) || (!cartridgesBeforeUpdating.isEmpty()) ||
+ (cartridgesAfterUpdating != null) || (!cartridgesAfterUpdating.isEmpty())) {
+
+ for (String before : cartridgesBeforeUpdating) {
+ for (String after : cartridgesAfterUpdating) {
+ if (before.equals(after)) {
+ cartridgesToRemove.remove(after);
+ cartridgesToAdd.remove(after);
+ }
}
}
}
- }
-
- // Add cartridge group elements to SM cache - done after cartridge group has been updated
- if (cartridgesToAdd != null || !cartridgesToAdd.isEmpty()) {
- smServiceClient.addUsedCartridgesInCartridgeGroups(cartridgeGroup.getName(),
- cartridgesToAdd.toArray(new String[cartridgesToRemove.size()]));
- }
- // Remove cartridge group elements from SM cache - done after cartridge group has been updated
- if (cartridgesToRemove != null || !cartridgesToRemove.isEmpty()) {
- smServiceClient.removeUsedCartridgesInCartridgeGroups(cartridgeGroup.getName(),
- cartridgesToRemove.toArray(new String[cartridgesToRemove.size()]));
- }
+ // Add cartridge group elements to SM cache - done after cartridge group has been updated
+ if (cartridgesToAdd != null || !cartridgesToAdd.isEmpty()) {
+ smServiceClient.addUsedCartridgesInCartridgeGroups(cartridgeGroup.getName(),
+ cartridgesToAdd.toArray(new String[cartridgesToRemove.size()]));
+ }
- if (serviceGroup != null) {
- autoscalerServiceClient.updateServiceGroup(
- ObjectConverter.convertServiceGroupDefinitionToASStubServiceGroup(cartridgeGroup));
+ // Remove cartridge group elements from SM cache - done after cartridge group has been updated
+ if (cartridgesToRemove != null || !cartridgesToRemove.isEmpty()) {
+ smServiceClient.removeUsedCartridgesInCartridgeGroups(cartridgeGroup.getName(),
+ cartridgesToRemove.toArray(new String[cartridgesToRemove.size()]));
+ }
}
} catch (RemoteException e) {
[06/11] stratos git commit: Resolving conflicts in wsdl
Posted by im...@apache.org.
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>
[10/11] stratos git commit: Updating wsdl
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/390e4ff4/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 a177b51..34454dd 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,16 +1,10 @@
-<<<<<<< HEAD
-<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns="http://impl.services.autoscaler.stratos.apache.org" xmlns:ax28="http://application.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax25="http://pojo.applications.autoscaler.stratos.apache.org/xsd" xmlns:ax217="http://policy.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax21="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ax22="http://common.stratos.apache.org/xsd" xmlns:ax219="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ax214="http://io.java/xsd" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ax221="http://pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax213="http://rmi.java/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:ax210="http://partition.common.stratos.apache.org/xsd" xmlns:ax223="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:http="http:
//schemas.xmlsoap.org/wsdl/http/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://impl.services.autoscaler.stratos.apache.org">
+<?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://policy.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax23="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax21="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ax219="http://partition.common.stratos.apache.org/xsd" xmlns:ax218="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax214="http://rmi.java/xsd" xmlns:ax215="http://io.java/xsd" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ax212="http://pojo.autoscaler.stratos.apache.org/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:ax210="http://common.stratos.apache.org/xsd" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:ax224="http://pojo.applications.a
utoscaler.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:ax215="http://io.java/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://rmi.java/xsd">
-=======
-<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ax27="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ns="http://impl.services.autoscaler.stratos.apache.org" xmlns:ax28="http://partition.common.stratos.apache.org/xsd" xmlns:ax25="http://application.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax21="http://pojo.applications.autoscaler.stratos.apache.org/xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ax22="http://common.stratos.apache.org/xsd" xmlns:ax216="http://policy.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax218="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ax221="http://pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax212="http://rmi.java/xsd" xmlns:ax213="http://io.java/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:ax223="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:http="http:/
/schemas.xmlsoap.org/wsdl/http/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://impl.services.autoscaler.stratos.apache.org">
- <wsdl:types>
- <xs:schema xmlns:ax214="http://io.java/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://rmi.java/xsd">
->>>>>>> upstream/master
+ <xs:schema xmlns:ax216="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="ax214:IOException">
+ <xs:extension base="ax216: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"/>
@@ -27,7 +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"/>
- <xs:element minOccurs="0" name="loadThresholds" nillable="true" type="ax223:LoadThresholds"/>
+ <xs:element minOccurs="0" name="loadThresholds" nillable="true" type="ax23:LoadThresholds"/>
<xs:element minOccurs="0" name="tenantId" type="xs:int"/>
</xs:sequence>
</xs:complexType>
@@ -39,25 +33,17 @@
</xs:sequence>
</xs:complexType>
</xs:schema>
-<<<<<<< HEAD
- <xs:schema xmlns:ax26="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd">
-=======
- <xs:schema xmlns:ax23="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd">
->>>>>>> upstream/master
+ <xs:schema xmlns:ax225="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="ax25:ComponentContext"/>
-=======
- <xs:element minOccurs="0" name="components" nillable="true" type="ax21:ComponentContext"/>
->>>>>>> upstream/master
+ <xs:element minOccurs="0" name="components" nillable="true" type="ax224: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="ax26:Properties"/>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax210: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"/>
@@ -66,17 +52,10 @@
</xs:complexType>
<xs:complexType name="ComponentContext">
<xs:sequence>
-<<<<<<< HEAD
- <xs:element maxOccurs="unbounded" minOccurs="0" name="applicationClusterContexts" nillable="true" type="ax25:ApplicationClusterContext"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax25:CartridgeContext"/>
- <xs:element minOccurs="0" name="dependencyContext" nillable="true" type="ax25:DependencyContext"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax25:GroupContext"/>
-=======
- <xs:element maxOccurs="unbounded" minOccurs="0" name="applicationClusterContexts" nillable="true" type="ax21:ApplicationClusterContext"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax21:CartridgeContext"/>
- <xs:element minOccurs="0" name="dependencyContext" nillable="true" type="ax21:DependencyContext"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax21:GroupContext"/>
->>>>>>> upstream/master
+ <xs: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"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="ApplicationClusterContext">
@@ -87,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="ax25:PersistenceContext"/>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax26:Properties"/>
-=======
- <xs:element minOccurs="0" name="persistenceContext" nillable="true" type="ax21:PersistenceContext"/>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax23:Properties"/>
->>>>>>> upstream/master
+ <xs:element minOccurs="0" name="persistenceContext" nillable="true" type="ax224:PersistenceContext"/>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax210: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>
@@ -101,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="ax25:VolumeContext"/>
-=======
- <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax21:VolumeContext"/>
->>>>>>> upstream/master
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax224:VolumeContext"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="VolumeContext">
@@ -124,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="ax25:SubscribableInfoContext"/>
-=======
- <xs:element minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax21:SubscribableInfoContext"/>
->>>>>>> upstream/master
+ <xs:element minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax224: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="ax25:ArtifactRepositoryContext"/>
-=======
- <xs:element minOccurs="0" name="artifactRepositoryContext" nillable="true" type="ax21:ArtifactRepositoryContext"/>
->>>>>>> upstream/master
+ <xs:element minOccurs="0" name="artifactRepositoryContext" nillable="true" type="ax224: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="ax25:PersistenceContext"/>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax26:Properties"/>
-=======
- <xs:element minOccurs="0" name="persistenceContext" nillable="true" type="ax21:PersistenceContext"/>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax23:Properties"/>
->>>>>>> upstream/master
+ <xs:element minOccurs="0" name="persistenceContext" nillable="true" type="ax224:PersistenceContext"/>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax210:Properties"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="ArtifactRepositoryContext">
@@ -173,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="ax25:CartridgeContext"/>
- <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="xs:string"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax25:GroupContext"/>
-=======
- <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax21:CartridgeContext"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax224:CartridgeContext"/>
<xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="xs:string"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax21:GroupContext"/>
->>>>>>> upstream/master
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax224: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"/>
@@ -192,8 +143,8 @@
<xs:complexType name="ServiceGroup">
<xs:sequence>
<xs:element maxOccurs="unbounded" minOccurs="0" name="cartridges" nillable="true" type="xs:string"/>
- <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="dependencies" nillable="true" type="ax212:Dependencies"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="groups" nillable="true" type="ax212:ServiceGroup"/>
<xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
@@ -205,514 +156,354 @@
</xs:sequence>
</xs:complexType>
</xs:schema>
-<<<<<<< HEAD
- <xs:schema xmlns:ax29="http://application.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax27="http://pojo.applications.autoscaler.stratos.apache.org/xsd" xmlns:ax24="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax216="http://rmi.java/xsd" xmlns:ax218="http://policy.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax220="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ax222="http://pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax224="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax226="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.autoscaler.stratos.apache.org">
-=======
- <xs:schema xmlns:ax26="http://application.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax24="http://pojo.applications.autoscaler.stratos.apache.org/xsd" xmlns:ax217="http://policy.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax219="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ax215="http://rmi.java/xsd" xmlns:ax222="http://pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax224="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax211="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax226="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.autoscaler.stratos.apache.org">
- <xs:import namespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd"/>
- <xs:import namespace="http://application.exception.autoscaler.stratos.apache.org/xsd"/>
->>>>>>> upstream/master
- <xs:import namespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"/>
- <xs:import namespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd"/>
- <xs:import namespace="http://application.exception.autoscaler.stratos.apache.org/xsd"/>
- <xs:import namespace="http://rmi.java/xsd"/>
- <xs:import namespace="http://policy.exception.autoscaler.stratos.apache.org/xsd"/>
+ <xs:schema xmlns:ax221="http://partition.common.stratos.apache.org/xsd" xmlns:ax223="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd">
+ <xs:import namespace="http://partition.common.stratos.apache.org/xsd"/>
+ <xs:import namespace="http://common.stratos.apache.org/xsd"/>
+ <xs:complexType name="DeploymentPolicy">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionRefs" nillable="true" type="ax219:NetworkPartitionRef"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="ApplicationPolicy">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="algorithm" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionGroups" nillable="true" type="xs:string"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitions" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax223:Properties"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:schema>
+ <xs:schema xmlns:ax29="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://rmi.java/xsd" xmlns:ax22="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ax222="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax213="http://pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax211="http://common.stratos.apache.org/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://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://policy.exception.autoscaler.stratos.apache.org/xsd"/>
+ <xs:import namespace="http://application.exception.autoscaler.stratos.apache.org/xsd"/>
<xs:import namespace="http://common.stratos.apache.org/xsd"/>
-<<<<<<< HEAD
- <xs:element name="getApplicationPolicy">
-=======
- <xs:element name="getApplication">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getApplicationResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax24:ApplicationContext"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="AutoscalerServiceApplicationDefinitionException">
+ <xs:import namespace="http://pojo.autoscaler.stratos.apache.org/xsd"/>
+ <xs:import namespace="http://rmi.java/xsd"/>
+ <xs:import namespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"/>
+ <xs:import namespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd"/>
+ <xs:element name="AutoscalerServiceAutoScalingPolicyAlreadyExistException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax25:ApplicationDefinitionException"/>
+ <xs:element minOccurs="0" name="AutoScalingPolicyAlreadyExistException" nillable="true" type="ax21:AutoScalingPolicyAlreadyExistException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateApplication">
+ <xs:element name="addAutoScalingPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax24:ApplicationContext"/>
+ <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax23: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">
+ <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>
- <xs:element name="deleteApplicationResponse">
+ <xs:element name="getAutoScalingPoliciesResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax23:AutoscalePolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getDeploymentPolicies">
->>>>>>> upstream/master
+ <xs:element name="AutoscalerServiceInvalidPolicyException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax25:InvalidPolicyException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationPolicyResponse">
+ <xs:element name="updateAutoScalingPolicy">
<xs:complexType>
<xs:sequence>
-<<<<<<< HEAD
- <xs:element minOccurs="0" name="return" nillable="true" type="ax24:ApplicationPolicy"/>
-=======
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax27:DeploymentPolicy"/>
->>>>>>> upstream/master
+ <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax23:AutoscalePolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplication">
+ <xs:element name="updateAutoScalingPolicyResponse">
<xs:complexType>
<xs:sequence>
-<<<<<<< HEAD
- <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
-=======
- <xs:element minOccurs="0" name="RemoteException" nillable="true" type="ax215:RemoteException"/>
->>>>>>> upstream/master
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationResponse">
+ <xs:element name="AutoscalerServiceUnremovablePolicyException">
<xs:complexType>
<xs:sequence>
-<<<<<<< HEAD
- <xs:element minOccurs="0" name="return" nillable="true" type="ax27:ApplicationContext"/>
-=======
- <xs:element minOccurs="0" name="InvalidDeploymentPolicyException" nillable="true" type="ax217:InvalidDeploymentPolicyException"/>
->>>>>>> upstream/master
+ <xs:element minOccurs="0" name="UnremovablePolicyException" nillable="true" type="ax25:UnremovablePolicyException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceApplicationDefinitionException">
+ <xs:element name="AutoscalerServicePolicyDoesNotExistException">
<xs:complexType>
<xs:sequence>
-<<<<<<< HEAD
- <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax29:ApplicationDefinitionException"/>
-=======
- <xs:element minOccurs="0" name="DeploymentPolicyNotExistsException" nillable="true" type="ax217:DeploymentPolicyNotExistsException"/>
->>>>>>> upstream/master
+ <xs:element minOccurs="0" name="PolicyDoesNotExistException" nillable="true" type="ax25:PolicyDoesNotExistException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateApplication">
+ <xs:element name="removeAutoScalingPolicy">
<xs:complexType>
<xs:sequence>
-<<<<<<< HEAD
- <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax27:ApplicationContext"/>
-=======
- <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax217:InvalidPolicyException"/>
->>>>>>> upstream/master
+ <xs:element minOccurs="0" name="autoscalePolicyId" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateApplicationResponse">
+ <xs:element name="removeAutoScalingPolicyResponse">
<xs:complexType>
<xs:sequence>
-<<<<<<< HEAD
<xs:element minOccurs="0" name="return" type="xs:boolean"/>
-=======
- <xs:element minOccurs="0" name="CloudControllerConnectionException" nillable="true" type="ax219:CloudControllerConnectionException"/>
->>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="deleteApplication">
+ <xs:element name="existApplication">
<xs:complexType>
<xs:sequence>
-<<<<<<< HEAD
<xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
-=======
- <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax27:DeploymentPolicy"/>
->>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="deleteApplicationResponse">
+ <xs:element name="existApplicationResponse">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getDeploymentPolicies">
- <xs:complexType>
- <xs:sequence/>
- </xs:complexType>
- </xs:element>
- <xs:element name="getDeploymentPoliciesResponse">
+ <xs:element name="AutoscalerServiceApplicationDefinitionException">
<xs:complexType>
<xs:sequence>
-<<<<<<< HEAD
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:DeploymentPolicy"/>
-=======
- <xs:element minOccurs="0" name="InvalidApplicationPolicyException" nillable="true" type="ax25:InvalidApplicationPolicyException"/>
->>>>>>> upstream/master
+ <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax29:ApplicationDefinitionException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceRemoteException">
+ <xs:element name="deployApplication">
<xs:complexType>
<xs:sequence>
-<<<<<<< HEAD
- <xs:element minOccurs="0" name="RemoteException" nillable="true" type="ax216:RemoteException"/>
-=======
- <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax27:ApplicationPolicy"/>
->>>>>>> upstream/master
+ <xs: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="AutoscalerServiceInvalidDeploymentPolicyException">
+ <xs:element name="deployApplicationResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="InvalidDeploymentPolicyException" nillable="true" type="ax217:InvalidDeploymentPolicyException"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceDeploymentPolicyNotExistsException">
+ <xs:element name="undeployApplication">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="DeploymentPolicyNotExistsException" nillable="true" type="ax217:DeploymentPolicyNotExistsException"/>
+ <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="AutoscalerServiceInvalidPolicyException">
+ <xs:element name="undeployApplicationResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax217:InvalidPolicyException"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceCloudControllerConnectionException">
+ <xs:element name="AutoscalerServiceInvalidArgumentException">
<xs:complexType>
<xs:sequence>
-<<<<<<< HEAD
- <xs:element minOccurs="0" name="CloudControllerConnectionException" nillable="true" type="ax219:CloudControllerConnectionException"/>
-=======
- <xs:element minOccurs="0" name="ApplicatioinPolicyNotExistsException" nillable="true" type="ax217:ApplicatioinPolicyNotExistsException"/>
->>>>>>> upstream/master
+ <xs:element minOccurs="0" name="InvalidArgumentException" nillable="true" type="ax21:InvalidArgumentException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateDeploymentPolicy">
+ <xs:element name="updateClusterMonitor">
<xs:complexType>
<xs:sequence>
-<<<<<<< HEAD
- <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax24:DeploymentPolicy"/>
-=======
- <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax27:ApplicationPolicy"/>
->>>>>>> upstream/master
+ <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax210:Properties"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateDeploymentPolicyResponse">
+ <xs:element name="updateClusterMonitorResponse">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceInvalidApplicationPolicyException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="InvalidApplicationPolicyException" nillable="true" type="ax29:InvalidApplicationPolicyException"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="addApplicationPolicy">
+ <xs:element name="AutoscalerServiceInvalidServiceGroupException">
<xs:complexType>
<xs:sequence>
-<<<<<<< HEAD
- <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax24:ApplicationPolicy"/>
-=======
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax27:ApplicationPolicy"/>
+ <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax29:InvalidServiceGroupException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="serviceGroupExist">
+ <xs:element name="addServiceGroup">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="serviceName" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax212:ServiceGroup"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="serviceGroupExistResponse">
+ <xs:element name="addServiceGroupResponse">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceAutoScalerException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="AutoScalerException" nillable="true" type="ax219:AutoScalerException"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getServiceGroups">
- <xs:complexType>
- <xs:sequence/>
- </xs:complexType>
- </xs:element>
- <xs:element name="getServiceGroupsResponse">
+ <xs:element name="findClusterId">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax221:ServiceGroup"/>
+ <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="AutoscalerServiceCartridgeGroupNotFoundException">
+ <xs:element name="findClusterIdResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="CartridgeGroupNotFoundException" nillable="true" type="ax219:CartridgeGroupNotFoundException"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="removeServiceGroup">
+ <xs:element name="AutoscalerServiceAutoScalerException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="groupName" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="AutoScalerException" nillable="true" type="ax21:AutoScalerException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="removeServiceGroupResponse">
+ <xs:element name="getApplicationNetworkPartitions">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
->>>>>>> upstream/master
+ <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addApplicationPolicyResponse">
+ <xs:element name="getApplicationNetworkPartitionsResponse">
<xs:complexType>
<xs:sequence>
-<<<<<<< HEAD
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
-=======
- <xs:element minOccurs="0" name="AutoScalingPolicyAlreadyExistException" nillable="true" type="ax219:AutoScalingPolicyAlreadyExistException"/>
->>>>>>> upstream/master
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="removeApplicationPolicy">
+ <xs:element name="AutoscalerServiceRemoteException">
<xs:complexType>
<xs:sequence>
-<<<<<<< HEAD
- <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/>
-=======
- <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax223:AutoscalePolicy"/>
->>>>>>> upstream/master
+ <xs:element minOccurs="0" name="RemoteException" nillable="true" type="ax217:RemoteException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="removeApplicationPolicyResponse">
+ <xs:element name="AutoscalerServiceInvalidDeploymentPolicyException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="InvalidDeploymentPolicyException" nillable="true" type="ax25:InvalidDeploymentPolicyException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceApplicatioinPolicyNotExistsException">
+ <xs:element name="AutoscalerServiceDeploymentPolicyAlreadyExistsException">
<xs:complexType>
<xs:sequence>
-<<<<<<< HEAD
- <xs:element minOccurs="0" name="ApplicatioinPolicyNotExistsException" nillable="true" type="ax217:ApplicatioinPolicyNotExistsException"/>
-=======
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax223:AutoscalePolicy"/>
->>>>>>> upstream/master
+ <xs:element minOccurs="0" name="DeploymentPolicyAlreadyExistsException" nillable="true" type="ax25:DeploymentPolicyAlreadyExistsException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateApplicationPolicy">
+ <xs:element name="addDeployementPolicy">
<xs:complexType>
<xs:sequence>
-<<<<<<< HEAD
- <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax24:ApplicationPolicy"/>
-=======
- <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax223:AutoscalePolicy"/>
->>>>>>> upstream/master
+ <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax218:DeploymentPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateApplicationPolicyResponse">
+ <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="getApplicationPolicies">
- <xs:complexType>
- <xs:sequence/>
- </xs:complexType>
- </xs:element>
- <xs:element name="getApplicationPoliciesResponse">
- <xs:complexType>
- <xs:sequence>
-<<<<<<< HEAD
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:ApplicationPolicy"/>
-=======
- <xs:element minOccurs="0" name="UnremovablePolicyException" nillable="true" type="ax217:UnremovablePolicyException"/>
->>>>>>> upstream/master
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="AutoscalerServiceInvalidServiceGroupException">
+ <xs:element name="AutoscalerServiceDeploymentPolicyNotExistsException">
<xs:complexType>
<xs:sequence>
-<<<<<<< HEAD
- <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax29:InvalidServiceGroupException"/>
-=======
- <xs:element minOccurs="0" name="PolicyDoesNotExistException" nillable="true" type="ax217:PolicyDoesNotExistException"/>
->>>>>>> upstream/master
+ <xs:element minOccurs="0" name="DeploymentPolicyNotExistsException" nillable="true" type="ax25:DeploymentPolicyNotExistsException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateServiceGroup">
+ <xs:element name="removeDeployementPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="cartridgeGroup" nillable="true" type="ax221:ServiceGroup"/>
+ <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateServiceGroupResponse">
+ <xs:element name="removeDeployementPolicyResponse">
<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="undeployServiceGroup">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="serviceName" 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="serviceGroupExistResponse">
+ <xs:element name="undeployServiceGroupResponse">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
-<<<<<<< HEAD
- <xs:element name="AutoscalerServiceAutoScalerException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="AutoScalerException" nillable="true" type="ax219:AutoScalerException"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getServiceGroups">
-=======
- <xs:element name="deployApplication">
->>>>>>> upstream/master
- <xs:complexType>
- <xs:sequence/>
- </xs:complexType>
- </xs:element>
- <xs:element name="getServiceGroupsResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax221:ServiceGroup"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="AutoscalerServiceCartridgeGroupNotFoundException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="CartridgeGroupNotFoundException" nillable="true" type="ax219:CartridgeGroupNotFoundException"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="removeServiceGroup">
+ <xs:element name="getApplicationPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="groupName" 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="removeServiceGroupResponse">
+ <xs:element name="getApplicationPolicyResponse">
<xs:complexType>
<xs:sequence>
-<<<<<<< HEAD
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
-=======
- <xs:element minOccurs="0" name="InvalidArgumentException" nillable="true" type="ax219:InvalidArgumentException"/>
->>>>>>> upstream/master
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax218:ApplicationPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="getApplications">
<xs:complexType>
-<<<<<<< HEAD
<xs:sequence/>
-=======
- <xs:sequence>
- <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax22:Properties"/>
- </xs:sequence>
->>>>>>> upstream/master
</xs:complexType>
</xs:element>
<xs:element name="getApplicationsResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax27:ApplicationContext"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax224:ApplicationContext"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="addApplication">
<xs:complexType>
<xs:sequence>
-<<<<<<< HEAD
- <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax27:ApplicationContext"/>
-=======
- <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax25:InvalidServiceGroupException"/>
->>>>>>> upstream/master
+ <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax224:ApplicationContext"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="addApplicationResponse">
<xs:complexType>
<xs:sequence>
-<<<<<<< HEAD
<xs:element minOccurs="0" name="return" type="xs:boolean"/>
-=======
- <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax221:ServiceGroup"/>
->>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -726,7 +517,7 @@
<xs:element name="getServiceGroupResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax221:ServiceGroup"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax212:ServiceGroup"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -737,18 +528,14 @@
</xs:sequence>
</xs:complexType>
</xs:element>
-<<<<<<< HEAD
<xs:element name="getAutoscalingPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax223:AutoscalePolicy"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax23:AutoscalePolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="getDeploymentPolicy">
-=======
- <xs:element name="getApplicationNetworkPartitions">
->>>>>>> upstream/master
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/>
@@ -758,349 +545,223 @@
<xs:element name="getDeploymentPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax24:DeploymentPolicy"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax218:DeploymentPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceAutoScalingPolicyAlreadyExistException">
+ <xs:element name="getApplication">
<xs:complexType>
<xs:sequence>
-<<<<<<< HEAD
- <xs:element minOccurs="0" name="AutoScalingPolicyAlreadyExistException" nillable="true" type="ax219:AutoScalingPolicyAlreadyExistException"/>
-=======
- <xs:element minOccurs="0" name="DeploymentPolicyAlreadyExistsException" nillable="true" type="ax217:DeploymentPolicyAlreadyExistsException"/>
->>>>>>> upstream/master
+ <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addAutoScalingPolicy">
+ <xs:element name="getApplicationResponse">
<xs:complexType>
<xs:sequence>
-<<<<<<< HEAD
- <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax223:AutoscalePolicy"/>
-=======
- <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax27:DeploymentPolicy"/>
->>>>>>> upstream/master
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax224:ApplicationContext"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addAutoScalingPolicyResponse">
+ <xs:element name="updateApplication">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax224:ApplicationContext"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getAutoScalingPolicies">
- <xs:complexType>
- <xs:sequence/>
- </xs:complexType>
- </xs:element>
- <xs:element name="getAutoScalingPoliciesResponse">
+ <xs:element name="updateApplicationResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax223:AutoscalePolicy"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateAutoScalingPolicy">
+ <xs:element name="deleteApplication">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax223:AutoscalePolicy"/>
+ <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateAutoScalingPolicyResponse">
+ <xs:element name="deleteApplicationResponse">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
-<<<<<<< HEAD
- <xs:element name="AutoscalerServiceUnremovablePolicyException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="UnremovablePolicyException" nillable="true" type="ax217:UnremovablePolicyException"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="AutoscalerServicePolicyDoesNotExistException">
+ <xs:element name="getDeploymentPolicies">
<xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="PolicyDoesNotExistException" nillable="true" type="ax217:PolicyDoesNotExistException"/>
- </xs:sequence>
+ <xs:sequence/>
</xs:complexType>
</xs:element>
- <xs:element name="removeAutoScalingPolicy">
+ <xs:element name="getDeploymentPoliciesResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="autoscalePolicyId" nillable="true" type="xs:string"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax218:DeploymentPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="removeAutoScalingPolicyResponse">
+ <xs:element name="AutoscalerServiceCloudControllerConnectionException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="CloudControllerConnectionException" nillable="true" type="ax21:CloudControllerConnectionException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="existApplication">
+ <xs:element name="updateDeploymentPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax218:DeploymentPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="existApplicationResponse">
+ <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="deployApplication">
- <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="AutoscalerServiceInvalidApplicationPolicyException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="InvalidApplicationPolicyException" nillable="true" type="ax29:InvalidApplicationPolicyException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="undeployApplication">
+ <xs:element name="addApplicationPolicy">
<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:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax218:ApplicationPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="undeployApplicationResponse">
+ <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="AutoscalerServiceInvalidArgumentException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="InvalidArgumentException" nillable="true" type="ax219:InvalidArgumentException"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="updateClusterMonitor">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax22:Properties"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="updateClusterMonitorResponse">
-=======
- <xs:element name="getApplicationPolicy">
+ <xs:element name="removeApplicationPolicy">
<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">
->>>>>>> upstream/master
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax27:ApplicationPolicy"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-<<<<<<< HEAD
- <xs:element name="addServiceGroup">
-=======
- <xs:element name="getApplications">
->>>>>>> upstream/master
+ <xs:element name="removeApplicationPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax221:ServiceGroup"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
-<<<<<<< HEAD
- <xs:element name="addServiceGroupResponse">
+ <xs:element name="AutoscalerServiceApplicatioinPolicyNotExistsException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="ApplicatioinPolicyNotExistsException" nillable="true" type="ax25:ApplicatioinPolicyNotExistsException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="findClusterId">
+ <xs:element name="updateApplicationPolicy">
<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:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax218:ApplicationPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="findClusterIdResponse">
+ <xs:element name="updateApplicationPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationNetworkPartitions">
-=======
- <xs:element name="getApplicationsResponse">
+ <xs:element name="getApplicationPolicies">
<xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:ApplicationContext"/>
- </xs:sequence>
+ <xs:sequence/>
</xs:complexType>
</xs:element>
- <xs:element name="addApplication">
+ <xs:element name="getApplicationPoliciesResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax24:ApplicationContext"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax218:ApplicationPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addApplicationResponse">
->>>>>>> upstream/master
+ <xs:element name="updateServiceGroup">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="cartridgeGroup" nillable="true" type="ax212:ServiceGroup"/>
</xs:sequence>
</xs:complexType>
</xs:element>
-<<<<<<< HEAD
- <xs:element name="getApplicationNetworkPartitionsResponse">
+ <xs:element name="updateServiceGroupResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceDeploymentPolicyAlreadyExistsException">
+ <xs:element name="serviceGroupExist">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="DeploymentPolicyAlreadyExistsException" nillable="true" type="ax217:DeploymentPolicyAlreadyExistsException"/>
+ <xs:element minOccurs="0" name="serviceName" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addDeployementPolicy">
-=======
- <xs:element name="getServiceGroup">
->>>>>>> upstream/master
+ <xs:element name="serviceGroupExistResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax24:DeploymentPolicy"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addDeployementPolicyResponse">
+ <xs:element name="getServiceGroups">
<xs:complexType>
- <xs:sequence>
-<<<<<<< HEAD
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
-=======
- <xs:element minOccurs="0" name="return" nillable="true" type="ax221:ServiceGroup"/>
->>>>>>> upstream/master
- </xs:sequence>
+ <xs: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="ax212:ServiceGroup"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="removeDeployementPolicyResponse">
+ <xs:element name="AutoscalerServiceCartridgeGroupNotFoundException">
<xs:complexType>
<xs:sequence>
-<<<<<<< HEAD
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
-=======
- <xs:element minOccurs="0" name="return" nillable="true" type="ax223:AutoscalePolicy"/>
->>>>>>> upstream/master
+ <xs:element minOccurs="0" name="CartridgeGroupNotFoundException" nillable="true" type="ax21: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>
-<<<<<<< HEAD
<xs:element minOccurs="0" name="return" type="xs:boolean"/>
-=======
- <xs:element minOccurs="0" name="return" nillable="true" type="ax27:DeploymentPolicy"/>
->>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:schema>
-<<<<<<< HEAD
- <xs:schema xmlns:ax23="http://common.stratos.apache.org/xsd" xmlns:ax212="http://partition.common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd">
- <xs:import namespace="http://common.stratos.apache.org/xsd"/>
- <xs:import namespace="http://partition.common.stratos.apache.org/xsd"/>
-=======
- <xs:schema xmlns:ax220="http://common.stratos.apache.org/xsd" xmlns:ax210="http://partition.common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd">
- <xs:import namespace="http://partition.common.stratos.apache.org/xsd"/>
- <xs:import namespace="http://common.stratos.apache.org/xsd"/>
- <xs:complexType name="DeploymentPolicy">
- <xs:sequence>
- <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionRefs" nillable="true" type="ax28:NetworkPartitionRef"/>
- </xs:sequence>
- </xs:complexType>
->>>>>>> upstream/master
- <xs:complexType name="ApplicationPolicy">
- <xs:sequence>
- <xs:element minOccurs="0" name="algorithm" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionGroups" nillable="true" type="xs:string"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitions" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax22:Properties"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="DeploymentPolicy">
- <xs:sequence>
- <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionRefs" nillable="true" type="ax212:NetworkPartitionRef"/>
- </xs:sequence>
- </xs:complexType>
- </xs:schema>
-<<<<<<< HEAD
- <xs:schema xmlns:ax211="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.common.stratos.apache.org/xsd">
-=======
- <xs:schema xmlns:ax29="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.common.stratos.apache.org/xsd">
->>>>>>> upstream/master
+ <xs:schema xmlns:ax220="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="partitionRefs" nillable="true" type="ax210:PartitionRef"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax210:PartitionRef"/>
-=======
- <xs:element maxOccurs="unbounded" minOccurs="0" name="partitionRefs" nillable="true" type="ax28:PartitionRef"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax28:PartitionRef"/>
->>>>>>> upstream/master
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="partitionRefs" nillable="true" type="ax219:PartitionRef"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax219:PartitionRef"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="PartitionRef">
@@ -1109,11 +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="ax211:Properties"/>
-=======
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax29:Properties"/>
->>>>>>> upstream/master
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax220:Properties"/>
</xs:sequence>
</xs:complexType>
</xs:schema>
@@ -1123,12 +780,12 @@
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="InvalidApplicationPolicyException">
+ <xs:complexType name="InvalidServiceGroupException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="InvalidServiceGroupException">
+ <xs:complexType name="InvalidApplicationPolicyException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
</xs:sequence>
@@ -1137,7 +794,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="ax22:Property"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax210:Property"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="Property">
@@ -1147,49 +804,41 @@
</xs:sequence>
</xs:complexType>
</xs:schema>
- <xs:schema xmlns:ax225="http://exception.autoscaler.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://policy.exception.autoscaler.stratos.apache.org/xsd">
+ <xs:schema xmlns:ax27="http://exception.autoscaler.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://policy.exception.autoscaler.stratos.apache.org/xsd">
<xs:import namespace="http://exception.autoscaler.stratos.apache.org/xsd"/>
- <xs:complexType name="InvalidDeploymentPolicyException">
- <xs:sequence/>
- </xs:complexType>
- <xs:complexType name="DeploymentPolicyNotExistsException">
- <xs:sequence/>
- </xs:complexType>
<xs:complexType name="InvalidPolicyException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="ApplicatioinPolicyNotExistsException">
- <xs:sequence>
- <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
<xs:complexType name="UnremovablePolicyException">
<xs:complexContent>
-<<<<<<< HEAD
- <xs:extension base="ax225:AutoScalerException">
-=======
- <xs:extension base="ax218:AutoScalerException">
->>>>>>> upstream/master
+ <xs:extension base="ax27:AutoScalerException">
<xs:sequence/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="PolicyDoesNotExistException">
<xs:complexContent>
-<<<<<<< HEAD
- <xs:extension base="ax225:AutoScalerException">
-=======
- <xs:extension base="ax218:AutoScalerException">
->>>>>>> upstream/master
+ <xs:extension base="ax27:AutoScalerException">
<xs:sequence/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
+ <xs:complexType name="InvalidDeploymentPolicyException">
+ <xs:sequence/>
+ </xs:complexType>
<xs:complexType name="DeploymentPolicyAlreadyExistsException">
<xs:sequence/>
</xs:complexType>
+ <xs:complexType name="DeploymentPolicyNotExistsException">
+ <xs:sequence/>
+ </xs:complexType>
+ <xs:complexType name="ApplicatioinPolicyNotExistsException">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
</xs:schema>
<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://io.java/xsd">
<xs:complexType name="IOException">
@@ -1197,7 +846,7 @@
</xs:complexType>
</xs:schema>
<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://exception.autoscaler.stratos.apache.org/xsd">
- <xs:complexType name="CloudControllerConnectionException">
+ <xs:complexType name="AutoScalingPolicyAlreadyExistException">
<xs:sequence/>
</xs:complexType>
<xs:complexType name="AutoScalerException">
@@ -1207,17 +856,17 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="CartridgeGroupNotFoundException">
- <xs:sequence/>
- </xs:complexType>
- <xs:complexType name="AutoScalingPolicyAlreadyExistException">
- <xs:sequence/>
- </xs:complexType>
<xs:complexType name="InvalidArgumentException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
+ <xs:complexType name="CloudControllerConnectionException">
+ <xs:sequence/>
+ </xs:complexType>
+ <xs:complexType name="CartridgeGroupNotFoundException">
+ <xs:sequence/>
+ </xs:complexType>
</xs:schema>
</wsdl:types>
<wsdl:message name="removeAutoScalingPolicyRequest">
@@ -1355,18 +1004,18 @@
<wsdl:message name="existApplicationResponse">
<wsdl:part name="parameters" element="ns:existApplicationResponse"/>
</wsdl:message>
- <wsdl:message name="getServiceGroupRequest">
- <wsdl:part name="parameters" element="ns:getServiceGroup"/>
- </wsdl:message>
- <wsdl:message name="getServiceGroupResponse">
- <wsdl:part name="parameters" element="ns:getServiceGroupResponse"/>
- </wsdl:message>
<wsdl:message name="deleteApplicationRequest">
<wsdl:part name="parameters" element="ns:deleteApplication"/>
</wsdl:message>
<wsdl:message name="deleteApplicationResponse">
<wsdl:part name="parameters" element="ns:deleteApplicationResponse"/>
</wsdl:message>
+ <wsdl:message name="getServiceGroupRequest">
+ <wsdl:part name="parameters" element="ns:getServiceGroup"/>
+ </wsdl:message>
+ <wsdl:message name="getServiceGroupResponse">
+ <wsdl:part name="parameters" element="ns:getServiceGroupResponse"/>
+ </wsdl:message>
<wsdl:message name="undeployServiceGroupRequest">
<wsdl:part name="parameters" element="ns:undeployServiceGroup"/>
</wsdl:message>
@@ -1551,14 +1200,14 @@
<wsdl:input message="ns:existApplicationRequest" wsaw:Action="urn:existApplication"/>
<wsdl:output message="ns:existApplicationResponse" wsaw:Action="urn:existApplicationResponse"/>
</wsdl:operation>
- <wsdl:operation name="getServiceGroup">
- <wsdl:input message="ns:getServiceGroupRequest" wsaw:Action="urn:getServiceGroup"/>
- <wsdl:output message="ns:getServiceGroupResponse" wsaw:Action="urn:getServiceGroupResponse"/>
- </wsdl:operation>
<wsdl:operation name="deleteApplication">
<wsdl:input message="ns:deleteApplicationRequest" wsaw:Action="urn:deleteApplication"/>
<wsdl:output message="ns:deleteApplicationResponse" wsaw:Action="urn:deleteApplicationResponse"/>
</wsdl:operation>
+ <wsdl:operation name="getServiceGroup">
+ <wsdl:input message="ns:getServiceGroupRequest" wsaw:Action="urn:getServiceGroup"/>
+ <wsdl:output message="ns:getServiceGroupResponse" wsaw:Action="urn:getServiceGroupResponse"/>
+ </wsdl:operation>
<wsdl:operation name="undeployServiceGroup">
<wsdl:input message="ns:undeployServiceGroupRequest" wsaw:Action="urn:undeployServiceGroup"/>
<wsdl:output message="ns:undeployServiceGroupResponse" wsaw:Action="urn:undeployServiceGroupResponse"/>
@@ -1832,8 +1481,8 @@
<soap:body use="literal"/>
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="deleteApplication">
- <soap:operation soapAction="urn:deleteApplication" style="document"/>
+ <wsdl:operation name="getServiceGroup">
+ <soap:operation soapAction="urn:getServiceGroup" style="document"/>
<wsdl:input>
<soap:body use="literal"/>
</wsdl:input>
@@ -1841,8 +1490,8 @@
<soap:body use="literal"/>
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="getServiceGroup">
- <soap:operation soapAction="urn:getServiceGroup" style="document"/>
+ <wsdl:operation name="deleteApplication">
+ <soap:operation soapAction="urn:deleteApplication" style="document"/>
<wsdl:input>
<soap:body use="literal"/>
</wsdl:input>
@@ -2219,8 +18
<TRUNCATED>
[08/11] stratos git commit: Fixing the update cartridge group
Posted by im...@apache.org.
Fixing the update cartridge group
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b6e8ef50
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b6e8ef50
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b6e8ef50
Branch: refs/heads/master
Commit: b6e8ef509aa31b67e19404b46aabb36b40227d23
Parents: 0a25877
Author: Vishanth <vi...@gmail.com>
Authored: Thu May 14 15:33:18 2015 +0530
Committer: Vishanth <vi...@gmail.com>
Committed: Thu May 14 15:33:18 2015 +0530
----------------------------------------------------------------------
.../rest/endpoint/api/StratosApiV41Utils.java | 52 ++++++++++++++------
1 file changed, 36 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/b6e8ef50/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
index 14b16fd..012b1b3 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
@@ -1112,36 +1112,56 @@ public class StratosApiV41Utils {
findCartridgesInServiceGroup(serviceGroupToBeUpdated, cartridgesBeforeUpdating);
findCartridgesInGroupBean(cartridgeGroup, cartridgesAfterUpdating);
+ List<String> cartridgesToRemove = new ArrayList<String>();
+ List<String> cartridgesToAdd = new ArrayList<String>();
- List<String> cartridgesToRemove = cartridgesBeforeUpdating;
- List<String> cartridgesToAdd = cartridgesAfterUpdating;
+ if (cartridgesBeforeUpdating != null) {
+ if (!cartridgesBeforeUpdating.isEmpty()) {
+ cartridgesToRemove.addAll(cartridgesBeforeUpdating);
+ }
+ }
- if ((cartridgesBeforeUpdating != null) || (!cartridgesBeforeUpdating.isEmpty()) ||
- (cartridgesAfterUpdating != null) || (!cartridgesAfterUpdating.isEmpty())) {
+ if (cartridgesAfterUpdating != null) {
+ if (!cartridgesAfterUpdating.isEmpty()) {
+ cartridgesToAdd.addAll(cartridgesAfterUpdating);
+ }
+ }
- for (String before : cartridgesBeforeUpdating) {
- for (String after : cartridgesAfterUpdating) {
- if (before.equals(after)) {
- cartridgesToRemove.remove(after);
- cartridgesToAdd.remove(after);
+ if ((cartridgesBeforeUpdating != null) && (cartridgesAfterUpdating != null)) {
+ if ((!cartridgesBeforeUpdating.isEmpty()) && (!cartridgesAfterUpdating.isEmpty())) {
+ for (String before : cartridgesBeforeUpdating) {
+ for (String after : cartridgesAfterUpdating) {
+ if (before.toLowerCase().equals(after.toLowerCase())) {
+ if (cartridgesToRemove.contains(after)) {
+ cartridgesToRemove.remove(after);
+ }
+ if (cartridgesToAdd.contains(after)) {
+ cartridgesToAdd.remove(after);
+ }
+ }
}
}
}
}
// Add cartridge group elements to SM cache - done after cartridge group has been updated
- if (cartridgesToAdd != null || !cartridgesToAdd.isEmpty()) {
- smServiceClient.addUsedCartridgesInCartridgeGroups(cartridgeGroup.getName(),
- cartridgesToAdd.toArray(new String[cartridgesToRemove.size()]));
+ if (cartridgesToAdd != null) {
+ if (!cartridgesToAdd.isEmpty()) {
+ {
+ smServiceClient.addUsedCartridgesInCartridgeGroups(cartridgeGroup.getName(),
+ cartridgesToAdd.toArray(new String[cartridgesToRemove.size()]));
+ }
+ }
}
// Remove cartridge group elements from SM cache - done after cartridge group has been updated
- if (cartridgesToRemove != null || !cartridgesToRemove.isEmpty()) {
- smServiceClient.removeUsedCartridgesInCartridgeGroups(cartridgeGroup.getName(),
- cartridgesToRemove.toArray(new String[cartridgesToRemove.size()]));
+ if (cartridgesToRemove != null) {
+ if (!cartridgesToRemove.isEmpty()) {
+ smServiceClient.removeUsedCartridgesInCartridgeGroups(cartridgeGroup.getName(),
+ cartridgesToRemove.toArray(new String[cartridgesToRemove.size()]));
+ }
}
}
-
} catch (RemoteException e) {
String message = String.format("Could not update cartridge group: [group-name] %s,",
cartridgeGroup.getName());
[11/11] stratos git commit: Updating wsdl
Posted by im...@apache.org.
Updating wsdl
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/390e4ff4
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/390e4ff4
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/390e4ff4
Branch: refs/heads/master
Commit: 390e4ff43de897e2287023987aff1e402c6ed7dd
Parents: 6d6e3ce
Author: Vishanth <vi...@gmail.com>
Authored: Thu May 14 16:04:07 2015 +0530
Committer: Vishanth <vi...@gmail.com>
Committed: Thu May 14 16:04:07 2015 +0530
----------------------------------------------------------------------
.../src/main/resources/AutoscalerService.wsdl | 825 ++++++-------------
1 file changed, 237 insertions(+), 588 deletions(-)
----------------------------------------------------------------------
[02/11] stratos git commit: Adding api method for updating cartridge
group
Posted by im...@apache.org.
Adding api method for updating cartridge group
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6cddb02d
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6cddb02d
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6cddb02d
Branch: refs/heads/master
Commit: 6cddb02d12ede270855d76393fbe5a5e28467039
Parents: bbda157
Author: Vishanth <vi...@gmail.com>
Authored: Wed May 13 21:54:07 2015 +0530
Committer: Vishanth <vi...@gmail.com>
Committed: Wed May 13 21:54:07 2015 +0530
----------------------------------------------------------------------
.../autoscaler/registry/RegistryManager.java | 23 +
.../autoscaler/services/AutoscalerService.java | 9 +
.../services/impl/AutoscalerServiceImpl.java | 54 ++
.../common/client/AutoscalerServiceClient.java | 5 +
.../rest/endpoint/api/StratosApiV41.java | 34 ++
.../rest/endpoint/api/StratosApiV41Utils.java | 88 +++
.../src/main/resources/AutoscalerService.wsdl | 556 ++++++++++---------
7 files changed, 520 insertions(+), 249 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/6cddb02d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java
index 2a64f25..61a73ac 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java
@@ -25,6 +25,7 @@ import org.apache.commons.logging.LogFactory;
import org.apache.stratos.autoscaler.algorithms.networkpartition.NetworkPartitionAlgorithmContext;
import org.apache.stratos.autoscaler.applications.pojo.ApplicationContext;
import org.apache.stratos.autoscaler.exception.AutoScalerException;
+import org.apache.stratos.autoscaler.exception.application.InvalidServiceGroupException;
import org.apache.stratos.autoscaler.pojo.ServiceGroup;
import org.apache.stratos.autoscaler.pojo.policy.autoscale.AutoscalePolicy;
import org.apache.stratos.autoscaler.pojo.policy.deployment.ApplicationPolicy;
@@ -348,6 +349,28 @@ public class RegistryManager {
}
}
+
+ public void updateServiceGroup(ServiceGroup serviceGroup) throws InvalidServiceGroupException {
+ try {
+ if (serviceGroup == null || StringUtils.isEmpty(serviceGroup.getName())) {
+ throw new IllegalArgumentException("Cartridge group or group name cannot be null");
+ }
+ if (getServiceGroup(serviceGroup.getName()) == null) {
+ throw new InvalidServiceGroupException(String.format("Cartridge group does not exist: " +
+ "[cartridge-group] %s", serviceGroup.getName()));
+ }
+
+ persistServiceGroup(serviceGroup);
+
+ if (log.isDebugEnabled()) {
+ log.debug(String.format("Updated cartridge group: [group-name] %s", serviceGroup.getName()));
+ }
+ } catch (Exception e) {
+ log.error((String.format("Unable to update cartridge group [group-name] %s",
+ serviceGroup.getName())), e);
+ }
+ }
+
public boolean serviceGroupExist(String serviceGroupName) {
String resourcePath = AutoscalerConstants.AUTOSCALER_RESOURCE + AutoscalerConstants.SERVICE_GROUP + "/" + serviceGroupName;
return resourceExist(resourcePath);
http://git-wip-us.apache.org/repos/asf/stratos/blob/6cddb02d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java
index 9aa9e6a..05ceac6 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java
@@ -201,6 +201,15 @@ public interface AutoscalerService {
public boolean addServiceGroup(ServiceGroup servicegroup) throws InvalidServiceGroupException;
/**
+ * Update a cartridge group
+ *
+ * @param serviceGroup
+ * @return
+ * @throws InvalidServiceGroupException
+ */
+ public boolean updateServiceGroup(ServiceGroup serviceGroup) throws InvalidServiceGroupException;
+
+ /**
* Remove a cartridge group
*
* @param groupName
http://git-wip-us.apache.org/repos/asf/stratos/blob/6cddb02d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
index 4d2e3bf..248b2a4 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
@@ -655,6 +655,60 @@ public class AutoscalerServiceImpl implements AutoscalerService {
return true;
}
+ public boolean updateServiceGroup(ServiceGroup cartridgeGroup) throws InvalidServiceGroupException {
+
+ if (cartridgeGroup == null || StringUtils.isEmpty(cartridgeGroup.getName())) {
+ String msg = "Cartridge group cannot be null or service name cannot be empty.";
+ log.error(msg);
+ throw new IllegalArgumentException(msg);
+ }
+
+ if (log.isInfoEnabled()) {
+ log.info(String.format("Updating cartridge group: [group-name] %s", cartridgeGroup.getName()));
+ }
+
+ String groupName = cartridgeGroup.getName();
+ if (!RegistryManager.getInstance().serviceGroupExist(groupName)) {
+ throw new InvalidServiceGroupException(String.format("Cartridge group does not exist: [cartridge-group] %s",
+ cartridgeGroup.getName()));
+ }
+
+ Dependencies dependencies = cartridgeGroup.getDependencies();
+ if (dependencies != null) {
+ String[] startupOrders = dependencies.getStartupOrders();
+ AutoscalerUtil.validateStartupOrders(groupName, startupOrders);
+
+ if (log.isDebugEnabled()) {
+ log.debug("StartupOrders " + Arrays.toString(startupOrders));
+
+ if (startupOrders != null) {
+ log.debug("StartupOrder:size " + startupOrders.length);
+ } else {
+ log.debug("StartupOrder: is null");
+ }
+ }
+
+ String[] scalingDependents = dependencies.getScalingDependants();
+ AutoscalerUtil.validateScalingDependencies(groupName, scalingDependents);
+
+ if (log.isDebugEnabled()) {
+ log.debug("ScalingDependent " + Arrays.toString(scalingDependents));
+
+ if (scalingDependents != null) {
+ log.debug("ScalingDependents:size " + scalingDependents.length);
+ } else {
+ log.debug("ScalingDependent: is null");
+ }
+ }
+ }
+
+ RegistryManager.getInstance().updateServiceGroup(cartridgeGroup);
+ if (log.isInfoEnabled()) {
+ log.info(String.format("Cartridge group successfully updated: [group-name] %s", cartridgeGroup.getName()));
+ }
+ return true;
+ }
+
@Override
public boolean removeServiceGroup(String groupName) throws CartridgeGroupNotFoundException {
try {
http://git-wip-us.apache.org/repos/asf/stratos/blob/6cddb02d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java
index c9c8750..ccc89d6 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java
@@ -185,6 +185,11 @@ public class AutoscalerServiceClient {
stub.addServiceGroup(serviceGroup);
}
+ public void updateServiceGroup(ServiceGroup serviceGroup) throws AutoscalerServiceInvalidServiceGroupExceptionException,
+ RemoteException {
+ stub.updateServiceGroup(serviceGroup);
+ }
+
public void removeServiceGroup(String groupName) throws RemoteException,
AutoscalerServiceCartridgeGroupNotFoundExceptionException {
stub.removeServiceGroup(groupName);
http://git-wip-us.apache.org/repos/asf/stratos/blob/6cddb02d/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
index 7082465..3c5b5a0 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
@@ -21,6 +21,7 @@ package org.apache.stratos.rest.endpoint.api;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.autoscaler.stub.*;
+import org.apache.stratos.autoscaler.stub.exception.InvalidServiceGroupException;
import org.apache.stratos.cloud.controller.stub.*;
import org.apache.stratos.common.beans.*;
import org.apache.stratos.common.beans.application.ApplicationBean;
@@ -467,6 +468,39 @@ public class StratosApiV41 extends AbstractApi {
}
/**
+ * Updates a cartridge group
+ *
+ * @param cartridgeGroup cartridge group definition
+ * @return 200 if network partition is successfully updated
+ * @throws RestAPIException
+ */
+ @PUT
+ @Path("/cartridgeGroups")
+ @Produces("application/json")
+ @Consumes("application/json")
+ @AuthorizationAction("/permission/protected/manage/updateServiceGroup")
+ public Response updateServiceGroup(
+ GroupBean cartridgeGroup) throws RestAPIException {
+
+ try {
+ StratosApiV41Utils.updateServiceGroup(cartridgeGroup);
+ URI url = uriInfo.getAbsolutePathBuilder().path(cartridgeGroup.getName()).build();
+
+ return Response.created(url).entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS,
+ String.format("Cartridge group updated successfully: [cartridge-group] %s",
+ cartridgeGroup.getName()))).build();
+
+ } catch (InvalidCartridgeGroupDefinitionException e) {
+ return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean(
+ ResponseMessageBean.ERROR, "Invalid cartridge group definition")).build();
+ } catch (RestAPIException e) {
+ return Response.status(Response.Status.NOT_FOUND).entity(new ResponseMessageBean(
+ ResponseMessageBean.ERROR, "Cartridge group not found")).build();
+ }
+ }
+
+
+ /**
* Gets the cartridge group definition.
*
* @param groupDefinitionName the group definition name
http://git-wip-us.apache.org/repos/asf/stratos/blob/6cddb02d/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
index ff2c08c..ab798c7 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
@@ -25,6 +25,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.autoscaler.stub.*;
import org.apache.stratos.autoscaler.stub.deployment.policy.ApplicationPolicy;
+import org.apache.stratos.autoscaler.stub.exception.InvalidServiceGroupException;
import org.apache.stratos.autoscaler.stub.pojo.ApplicationContext;
import org.apache.stratos.autoscaler.stub.pojo.ServiceGroup;
import org.apache.stratos.cloud.controller.stub.*;
@@ -1071,6 +1072,93 @@ public class StratosApiV41Utils {
}
/**
+ * Update a cartridge group
+ *
+ * @param cartridgeGroup
+ * @throws RestAPIException
+ */
+ public static void updateServiceGroup(GroupBean cartridgeGroup) throws RestAPIException,
+ InvalidCartridgeGroupDefinitionException {
+ try {
+ ServiceGroup serviceGroup = ObjectConverter.convertServiceGroupDefinitionToASStubServiceGroup(
+ cartridgeGroup);
+ AutoscalerServiceClient autoscalerServiceClient = AutoscalerServiceClient.getInstance();
+
+ StratosManagerServiceClient smServiceClient = getStratosManagerServiceClient();
+
+ // Validate whether cartridge group can be updated
+ if (!smServiceClient.canCartirdgeGroupBeRemoved(cartridgeGroup.getName())) {
+ String message = "Cannot update cartridge group: [group-name] " + cartridgeGroup.getName() +
+ " since it is used in another cartridge group or an application";
+ log.error(message);
+ throw new RestAPIException(message);
+ }
+
+ //validate the group definition to check if cartridges duplicate in any groups defined
+ validateCartridgeDuplicationInGroupDefinition(cartridgeGroup);
+
+ //validate the group definition to check if groups duplicate in any groups and
+ //validate the group definition to check for cyclic group behaviour
+ validateGroupDuplicationInGroupDefinition(cartridgeGroup);
+
+ List<String> cartridgesBeforeUpdating = new ArrayList<String>();
+ List<String> cartridgesAfterUpdating = new ArrayList<String>();
+
+ ServiceGroup serviceGroupToBeUpdated = autoscalerServiceClient.getServiceGroup(cartridgeGroup.getName());
+ findCartridgesInServiceGroup(serviceGroupToBeUpdated, cartridgesBeforeUpdating);
+ findCartridgesInGroupBean(cartridgeGroup, cartridgesAfterUpdating);
+
+ List<String> cartridgesToRemove = cartridgesBeforeUpdating;
+ List<String> cartridgesToAdd = cartridgesAfterUpdating;
+
+ if ((cartridgesBeforeUpdating != null) || (!cartridgesBeforeUpdating.isEmpty()) ||
+ (cartridgesAfterUpdating != null) || (!cartridgesAfterUpdating.isEmpty())) {
+
+ for (String before : cartridgesBeforeUpdating) {
+ for (String after : cartridgesAfterUpdating) {
+ if (before.equals(after)) {
+ cartridgesToRemove.remove(after);
+ cartridgesToAdd.remove(after);
+ }
+ }
+ }
+ }
+
+ // Add cartridge group elements to SM cache - done after cartridge group has been updated
+ if (cartridgesToAdd != null || !cartridgesToAdd.isEmpty()) {
+ smServiceClient.addUsedCartridgesInCartridgeGroups(cartridgeGroup.getName(),
+ cartridgesToAdd.toArray(new String[cartridgesToRemove.size()]));
+ }
+
+ // Remove cartridge group elements from SM cache - done after cartridge group has been updated
+ if (cartridgesToRemove != null || !cartridgesToRemove.isEmpty()) {
+ smServiceClient.removeUsedCartridgesInCartridgeGroups(cartridgeGroup.getName(),
+ cartridgesToRemove.toArray(new String[cartridgesToRemove.size()]));
+ }
+
+ if (serviceGroup != null) {
+ autoscalerServiceClient.updateServiceGroup(
+ ObjectConverter.convertServiceGroupDefinitionToASStubServiceGroup(cartridgeGroup));
+ }
+
+ } catch (RemoteException e) {
+ String message = String.format("Could not update cartridge group: [group-name] %s,",
+ cartridgeGroup.getName());
+ log.error(message);
+ throw new RestAPIException(message, e);
+ } catch (AutoscalerServiceInvalidServiceGroupExceptionException e) {
+ String message = String.format("Autoscaler invalid cartridge group definition: [group-name] %s",
+ cartridgeGroup.getName());
+ log.error(message);
+ throw new InvalidCartridgeGroupDefinitionException(message, e);
+ } catch (ServiceGroupDefinitionException e) {
+ String message = String.format("Invalid cartridge group definition: [group-name] %s", cartridgeGroup.getName());
+ log.error(message);
+ throw new InvalidCartridgeGroupDefinitionException(message, e);
+ }
+ }
+
+ /**
* returns any duplicates in a List
*
* @param checkedList List to find duplicates from
[09/11] stratos git commit: resolving wsdl conflict
Posted by im...@apache.org.
resolving wsdl conflict
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6d6e3ce1
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6d6e3ce1
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6d6e3ce1
Branch: refs/heads/master
Commit: 6d6e3ce1dea89ee19b724fd256ebd73bd46aa693
Parents: b6e8ef5 0bc0777
Author: Vishanth <vi...@gmail.com>
Authored: Thu May 14 15:41:25 2015 +0530
Committer: Vishanth <vi...@gmail.com>
Committed: Thu May 14 15:41:25 2015 +0530
----------------------------------------------------------------------
.../dependency/DependencyBuilder.java | 6 +-
.../applications/dependency/DependencyTree.java | 13 +-
.../ClusterStatusTerminatedProcessor.java | 3 +-
.../stratos/cli/RestCommandLineService.java | 3 +-
.../openstack/networking/NovaNetworkingApi.java | 10 +-
.../common/beans/cartridge/CartridgeBean.java | 10 -
.../beans/cartridge/CartridgeReferenceBean.java | 3 +
...tionPolicyNetworkPartitionReferenceBean.java | 45 -
.../ChildLevelNetworkPartitionBean.java | 54 -
.../partition/ChildLevelPartitionBean.java | 44 -
.../beans/partition/NetworkPartitionBean.java | 9 -
.../NetworkPartitionReferenceBean.java | 75 ++
.../common/beans/partition/PartitionBean.java | 31 -
.../beans/partition/PartitionReferenceBean.java | 66 +
.../policy/autoscale/AutoscalePolicyBean.java | 9 -
.../policy/deployment/ChildPolicyBean.java | 47 -
.../policy/deployment/DeploymentPolicyBean.java | 8 +-
.../console/controllers/login/validator.jag | 20 +
.../console/errorhtml/error-404.html | 21 +
.../console/errorhtml/error.html | 21 +
.../css/bootstrap-3.2.0/bootstrap.min.css | 26 +-
.../fonts/glyphicons-halflings-regular.svg | 18 +
.../console/themes/theme0/css/custom.css | 21 +
.../theme0/css/custom/application_editor.css | 20 +
.../css/custom/application_group_editor.css | 21 +-
.../theme0/css/custom/applications_deploy.css | 20 +
.../console/themes/theme0/css/custom/style.css | 21 +
.../themes/theme0/css/custom/topology.css | 21 +
.../css/font-awesome-4.2.0/font-awesome.min.css | 25 +-
.../fonts/fontawesome-webfont.svg | 18 +
.../theme0/css/font-mfizz-1.2/font-mfizz.css | 30 +-
.../theme0/css/font-mfizz-1.2/font-mfizz.svg | 18 +
.../jquery.contextMenu/jquery.contextMenu.css | 25 +-
.../themes/theme0/css/web-fonts/open_sans.css | 21 +
.../console/themes/theme0/css/wizard/custom.css | 21 +
.../themes/theme0/helpers/applications.js | 22 +-
.../theme0/helpers/applications_deploy.js | 21 +
.../theme0/helpers/applications_editor.js | 21 +
.../themes/theme0/helpers/applications_form.js | 21 +
.../theme0/helpers/applications_group_editor.js | 21 +
.../theme0/helpers/applications_topology.js | 21 +
.../themes/theme0/helpers/applications_view.js | 21 +
.../themes/theme0/helpers/configure_form.js | 21 +
.../console/themes/theme0/helpers/login_body.js | 21 +
.../console/themes/theme0/helpers/users_form.js | 21 +
.../console/themes/theme0/helpers/wizard.js | 21 +
.../js/JSONEditor-0.7.12/jsoneditor-0.7.12.js | 26 +-
.../theme0/js/bootstrap-3.2.0/bootstrap.min.js | 24 +-
.../console/themes/theme0/js/canvg/canvg.js | 22 +-
.../console/themes/theme0/js/canvg/rgbcolor.js | 24 +-
.../console/themes/theme0/js/custom.js | 21 +
.../theme0/js/custom/applications-deploy.js | 21 +
.../theme0/js/custom/applications-editor.js | 21 +
.../theme0/js/custom/applications-view.js | 20 +
.../js/custom/applications_group_editor.js | 21 +
.../theme0/js/custom/applications_topology.js | 21 +
.../console/themes/theme0/js/custom/form.js | 21 +
.../console/themes/theme0/js/custom/script.js | 21 +
.../themes/theme0/js/d3js-v3/d3.v3.min.js | 21 +
.../themes/theme0/js/dagre-v0.7.0/dagre.min.js | 21 +
.../js/jquery-1.11.1/jquery-1.11.1.min.js | 22 +-
.../js/jquery.contextMenu/jquery.contextMenu.js | 23 +-
.../js/jquery.contextMenu/jquery.ui.position.js | 25 +-
.../js/jsplumb-1.7.2/dom.jsPlumb-1.7.2-min.js | 21 +
.../console/themes/theme0/js/login/login.js | 21 +
.../themes/theme0/js/noty-2.2.9/noty-2.2.9.js | 27 +-
.../console/themes/theme0/js/wizard/custom.js | 30 +-
.../console/themes/theme0/pages/index.hbs | 20 +
.../themes/theme0/partials/applications.hbs | 21 +
.../theme0/partials/applications_deploy.hbs | 21 +
.../theme0/partials/applications_editor.hbs | 21 +
.../theme0/partials/applications_form.hbs | 21 +
.../partials/applications_group_editor.hbs | 21 +
.../theme0/partials/applications_topology.hbs | 21 +
.../theme0/partials/applications_view.hbs | 21 +
.../themes/theme0/partials/configure_form.hbs | 21 +
.../themes/theme0/partials/error_page.hbs | 21 +
.../themes/theme0/partials/index_header.hbs | 21 +
.../themes/theme0/partials/index_left_menu.hbs | 21 +
.../theme0/partials/index_right_menu_help.hbs | 21 +
.../theme0/partials/index_right_menu_log.hbs | 21 +
.../themes/theme0/partials/index_sub_header.hbs | 21 +
.../themes/theme0/partials/login_body.hbs | 21 +
.../themes/theme0/partials/login_header.hbs | 21 +
.../themes/theme0/partials/metro_menu.hbs | 21 +
.../themes/theme0/partials/users_form.hbs | 21 +
.../console/themes/theme0/partials/wizard.hbs | 21 +
.../stratos-resources/css/bootstrap-theme.css | 21 +
.../rest/endpoint/api/StratosApiV41Utils.java | 6 +-
.../stratos/rest/endpoint/mock/MockContext.java | 146 +--
.../util/converter/ObjectConverter.java | 116 +-
...equestHandlingCapabilityWindowProcessor.java | 21 +-
.../conf/templates/jndi.properties.template | 16 +
.../scripts/common/add-domain-mappings.sh | 21 +
.../scripts/common/add-network-partition.sh | 21 +
.../scripts/common/deploy.sh | 21 +
.../scripts/common/get-application-runtime.sh | 21 +
.../scripts/common/list-domain-mappings.sh | 21 +
.../scripts/common/list-network-partition.sh | 21 +
.../scripts/common/undeploy.sh | 21 +
.../scripts/common/update-deployment-policy.sh | 22 +
.../scripts/mock/deploy.sh | 21 +
.../scripts/mock/undeploy.sh | 21 +
.../scripts/common/deploy.sh | 21 +
.../scripts/common/undeploy.sh | 19 +
.../tomcat-single-signon/scripts/ec2/deploy.sh | 22 +-
.../scripts/ec2/undeploy.sh | 19 +
.../scripts/kubernetes/deploy.sh | 22 +
.../scripts/kubernetes/undeploy.sh | 19 +
.../tomcat-single-signon/scripts/mock/deploy.sh | 21 +
.../scripts/mock/undeploy.sh | 19 +
.../scripts/openstack/deploy.sh | 21 +
.../scripts/openstack/undeploy.sh | 19 +
.../wordpress-app/scripts/common/deploy.sh | 22 +
.../wordpress-app/scripts/common/undeploy.sh | 19 +
.../complex/wordpress-app/scripts/ec2/deploy.sh | 21 +
.../wordpress-app/scripts/ec2/undeploy.sh | 19 +
.../wordpress-app/scripts/kubernetes/deploy.sh | 22 +
.../scripts/kubernetes/undeploy.sh | 19 +
.../wordpress-app/scripts/mock/deploy.sh | 21 +
.../wordpress-app/scripts/mock/undeploy.sh | 20 +
.../wordpress-app/scripts/openstack/deploy.sh | 22 +
.../wordpress-app/scripts/openstack/undeploy.sh | 20 +
.../scripts/common/deploy.sh | 20 +
.../scripts/common/undeploy.sh | 19 +
.../complex-app-with-lb/scripts/ec2/deploy.sh | 20 +
.../complex-app-with-lb/scripts/ec2/undeploy.sh | 20 +
.../scripts/kubernetes/deploy.sh | 20 +
.../scripts/kubernetes/undeploy.sh | 20 +
.../complex-app-with-lb/scripts/mock/deploy.sh | 19 +
.../scripts/mock/undeploy.sh | 20 +
.../scripts/openstack/deploy.sh | 20 +
.../scripts/openstack/undeploy.sh | 20 +
.../scripts/common/deploy.sh | 20 +
.../scripts/common/undeploy.sh | 20 +
.../scripts/ec2/deploy.sh | 20 +
.../scripts/ec2/undeploy.sh | 20 +
.../scripts/kubernetes/deploy.sh | 20 +
.../scripts/kubernetes/undeploy.sh | 20 +
.../scripts/mock/deploy.sh | 20 +
.../scripts/mock/undeploy.sh | 20 +
.../scripts/openstack/deploy.sh | 20 +
.../scripts/openstack/undeploy.sh | 20 +
.../scripts/common/deploy.sh | 22 +
.../scripts/common/undeploy.sh | 21 +
.../scripts/ec2/deploy.sh | 21 +
.../scripts/ec2/undeploy.sh | 22 +
.../scripts/kubernetes/deploy.sh | 21 +
.../scripts/kubernetes/undeploy.sh | 21 +
.../scripts/mock/deploy.sh | 22 +
.../scripts/mock/undeploy.sh | 24 +
.../scripts/openstack/deploy.sh | 22 +
.../scripts/openstack/undeploy.sh | 24 +
.../scripts/common/deploy.sh | 22 +-
.../scripts/common/undeploy.sh | 22 +-
.../scripts/common/update-deployment-policy.sh | 22 +-
.../scripts/common/update-network-partition.sh | 22 +-
.../scripts/ec2/deploy.sh | 22 +-
.../scripts/ec2/undeploy.sh | 22 +-
.../scripts/kubernetes/deploy.sh | 22 +-
.../scripts/kubernetes/undeploy.sh | 22 +-
.../scripts/mock/deploy.sh | 22 +-
.../scripts/mock/undeploy.sh | 22 +-
.../scripts/mock/update-network-partition.sh | 21 +
.../scripts/openstack/deploy.sh | 22 +-
.../scripts/openstack/undeploy.sh | 22 +-
.../openstack/update-network-partition.sh | 21 +
.../scripts/common/deploy.sh | 22 +-
.../scripts/common/undeploy.sh | 22 +-
.../scripts/ec2/deploy.sh | 22 +-
.../scripts/ec2/undeploy.sh | 22 +-
.../scripts/kubernetes/deploy.sh | 22 +-
.../scripts/kubernetes/undeploy.sh | 22 +-
.../scripts/mock/deploy.sh | 22 +-
.../scripts/mock/undeploy.sh | 22 +-
.../scripts/openstack/deploy.sh | 22 +-
.../scripts/openstack/undeploy.sh | 22 +-
.../scripts/common/deploy.sh | 22 +-
.../scripts/common/undeploy.sh | 22 +-
.../app-bursting-pattern/scripts/ec2/deploy.sh | 22 +-
.../scripts/ec2/undeploy.sh | 22 +-
.../scripts/kubernetes/deploy.sh | 22 +-
.../scripts/kubernetes/undeploy.sh | 22 +-
.../app-bursting-pattern/scripts/mock/deploy.sh | 22 +-
.../scripts/mock/undeploy.sh | 22 +-
.../scripts/openstack/deploy.sh | 22 +-
.../scripts/openstack/undeploy.sh | 22 +-
.../sample-cartridges/scripts/common/deploy.sh | 22 +-
.../scripts/common/undeploy.sh | 22 +-
.../sample-cartridges/scripts/ec2/deploy.sh | 22 +-
.../sample-cartridges/scripts/ec2/undeploy.sh | 22 +-
.../scripts/kubernetes/deploy.sh | 22 +-
.../scripts/kubernetes/undeploy.sh | 22 +-
.../sample-cartridges/scripts/mock/deploy.sh | 22 +-
.../sample-cartridges/scripts/mock/undeploy.sh | 22 +-
.../scripts/openstack/deploy.sh | 22 +-
.../scripts/openstack/undeploy.sh | 22 +-
.../sample-groups/scripts/common/deploy.sh | 22 +-
.../sample-groups/scripts/common/undeploy.sh | 22 +-
.../sample-groups/scripts/ec2/deploy.sh | 22 +-
.../sample-groups/scripts/ec2/undeploy.sh | 22 +-
.../sample-groups/scripts/kubernetes/deploy.sh | 22 +-
.../scripts/kubernetes/undeploy.sh | 22 +-
.../sample-groups/scripts/mock/deploy.sh | 22 +-
.../sample-groups/scripts/mock/undeploy.sh | 22 +-
.../sample-groups/scripts/openstack/deploy.sh | 22 +-
.../sample-groups/scripts/openstack/undeploy.sh | 22 +-
.../group-scaling-app/scripts/common/deploy.sh | 22 +-
.../scripts/common/undeploy.sh | 22 +-
.../group-scaling-app/scripts/ec2/deploy.sh | 22 +-
.../group-scaling-app/scripts/ec2/undeploy.sh | 22 +-
.../scripts/kubernetes/deploy.sh | 22 +-
.../scripts/kubernetes/undeploy.sh | 22 +-
.../group-scaling-app/scripts/mock/deploy.sh | 22 +-
.../group-scaling-app/scripts/mock/undeploy.sh | 22 +-
.../scripts/openstack/deploy.sh | 22 +-
.../scripts/openstack/undeploy.sh | 22 +-
.../group-scaling-v1/scripts/common/deploy.sh | 22 +-
.../group-scaling-v1/scripts/common/undeploy.sh | 22 +-
.../group-scaling-v1/scripts/ec2/deploy.sh | 22 +-
.../group-scaling-v1/scripts/ec2/undeploy.sh | 22 +-
.../scripts/kubernetes/deploy.sh | 22 +-
.../scripts/kubernetes/undeploy.sh | 22 +-
.../group-scaling-v1/scripts/mock/deploy.sh | 22 +-
.../group-scaling-v1/scripts/mock/undeploy.sh | 22 +-
.../scripts/openstack/deploy.sh | 22 +-
.../scripts/openstack/undeploy.sh | 22 +-
.../scripts/common/deploy.sh | 22 +-
.../scripts/common/undeploy.sh | 22 +-
.../scripts/ec2/deploy.sh | 22 +-
.../scripts/ec2/undeploy.sh | 22 +-
.../scripts/kubernetes/deploy.sh | 22 +-
.../scripts/kubernetes/undeploy.sh | 22 +-
.../scripts/mock/deploy.sh | 22 +-
.../scripts/mock/undeploy.sh | 22 +-
.../scripts/openstack/deploy.sh | 22 +-
.../scripts/openstack/undeploy.sh | 22 +-
.../scripts/common/add-domain-mappings.sh | 22 +-
.../scripts/common/add-network-partition.sh | 22 +-
.../scripts/common/deploy.sh | 22 +-
.../scripts/common/get-application-runtime.sh | 22 +-
.../scripts/common/list-domain-mappings.sh | 22 +-
.../scripts/common/list-network-partition.sh | 22 +-
.../scripts/common/undeploy.sh | 22 +-
.../scripts/common/update-deployment-policy.sh | 22 +-
.../scripts/common/update-network-partition.sh | 22 +-
.../single-cartridge-app/scripts/ec2/deploy.sh | 22 +-
.../scripts/ec2/undeploy.sh | 22 +-
.../scripts/kubernetes/deploy.sh | 22 +-
.../scripts/kubernetes/undeploy.sh | 22 +-
.../single-cartridge-app/scripts/mock/deploy.sh | 22 +-
.../scripts/mock/undeploy.sh | 22 +-
.../scripts/openstack/deploy.sh | 22 +-
.../scripts/openstack/undeploy.sh | 22 +-
.../single-group-app/scripts/common/deploy.sh | 22 +-
.../single-group-app/scripts/common/undeploy.sh | 22 +-
.../single-group-app/scripts/ec2/deploy.sh | 22 +-
.../single-group-app/scripts/ec2/undeploy.sh | 22 +-
.../scripts/kubernetes/deploy.sh | 22 +-
.../scripts/kubernetes/undeploy.sh | 22 +-
.../single-group-app/scripts/mock/deploy.sh | 22 +-
.../single-group-app/scripts/mock/undeploy.sh | 22 +-
.../scripts/openstack/deploy.sh | 22 +-
.../scripts/openstack/undeploy.sh | 22 +-
samples/cartridges/mock/postgres | 47 -
.../src/main/resources/AutoscalerService.wsdl | 355 +++++-
.../main/resources/CloudControllerService.wsdl | 1134 +++++++++---------
.../main/resources/StratosManagerService.wsdl | 19 +
.../deployment_script.sh | 20 +
.../service-images/php/files/000-default.conf | 17 +
.../plugins/PhpServerStarterPlugin.yapsy-plugin | 17 +
.../tomcat-saml-sso/files/create-admin-user.sh | 19 +
.../service-images/tomcat-saml-sso/files/env | 17 +
.../TomcatServerStarterPlugin.yapsy-plugin | 17 +
.../TomcatWSO2ISMetadataPublisher.yapsy-plugin | 16 +
.../tomcat/files/create-admin-user.sh | 18 +
.../service-images/tomcat/files/env | 17 +
.../TomcatServerStarterPlugin.yapsy-plugin | 16 +
.../service-images/wso2is-saml-sso/files/env | 17 +
.../plugins/WSO2ISMetaDataHandler.yapsy-plugin | 17 +
.../stratos-docker-images/bind/zone_template | 21 +
.../stratos-docker-images/mysql/my.cnf | 21 +
.../stratos-docker-images/run-nsenter.sh | 20 +
.../conf/templates/jndi.properties.template.erb | 22 +
tools/puppet3/modules/appserver/Modulefile | 21 +
.../modules/appserver/lib/facter/java_home.rb | 17 +
.../conf/datasources/master-datasources.xml.erb | 16 +
.../datasources/master-datasources/_remote.erb | 18 +-
.../templates/conf/registry/_remote.erb | 16 +
.../templates/conf/user-mgt/_roldap.erb | 16 +
.../templates/conf/user-mgt/_rwldap.erb | 16 +
.../modules/jboss/templates/hornetq/run.erb | 21 +
.../conf/templates/jndi.properties.template.erb | 22 +
.../templates/mysql_root_password_setter.sh.erb | 17 +
.../mysql/templates/publish-metadata.py.erb | 17 +
.../plugins/PhpServerStarterPlugin.yapsy-plugin | 17 +
.../python_agent/templates/logging.ini.erb | 17 +
297 files changed, 6759 insertions(+), 1270 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/6d6e3ce1/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/6d6e3ce1/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoscalerService.wsdl
----------------------------------------------------------------------
diff --cc service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoscalerService.wsdl
index 4bb8d87,d5f5531..a177b51
--- a/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoscalerService.wsdl
+++ b/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoscalerService.wsdl
@@@ -1,6 -1,6 +1,12 @@@
++<<<<<<< HEAD
+<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns="http://impl.services.autoscaler.stratos.apache.org" xmlns:ax28="http://application.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax25="http://pojo.applications.autoscaler.stratos.apache.org/xsd" xmlns:ax217="http://policy.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax21="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ax22="http://common.stratos.apache.org/xsd" xmlns:ax219="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ax214="http://io.java/xsd" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ax221="http://pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax213="http://rmi.java/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:ax210="http://partition.common.stratos.apache.org/xsd" xmlns:ax223="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:http="http
://schemas.xmlsoap.org/wsdl/http/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://impl.services.autoscaler.stratos.apache.org">
+ <wsdl:types>
+ <xs:schema xmlns:ax215="http://io.java/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://rmi.java/xsd">
++=======
+ <?xml version="1.0" encoding="UTF-8"?><wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ax27="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ns="http://impl.services.autoscaler.stratos.apache.org" xmlns:ax28="http://partition.common.stratos.apache.org/xsd" xmlns:ax25="http://application.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax21="http://pojo.applications.autoscaler.stratos.apache.org/xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ax22="http://common.stratos.apache.org/xsd" xmlns:ax216="http://policy.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax218="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ax221="http://pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax212="http://rmi.java/xsd" xmlns:ax213="http://io.java/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:ax223="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:http="http:
//schemas.xmlsoap.org/wsdl/http/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://impl.services.autoscaler.stratos.apache.org">
+ <wsdl:types>
+ <xs:schema xmlns:ax214="http://io.java/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://rmi.java/xsd">
++>>>>>>> upstream/master
<xs:import namespace="http://io.java/xsd"/>
<xs:complexType name="RemoteException">
<xs:complexContent>
@@@ -33,13 -33,13 +39,21 @@@
</xs:sequence>
</xs:complexType>
</xs:schema>
++<<<<<<< HEAD
+ <xs:schema xmlns:ax26="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd">
++=======
+ <xs:schema xmlns:ax23="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd">
++>>>>>>> upstream/master
<xs:import namespace="http://common.stratos.apache.org/xsd"/>
<xs:complexType name="ApplicationContext">
<xs:sequence>
<xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="components" nillable="true" type="ax25:ComponentContext"/>
++=======
+ <xs:element minOccurs="0" name="components" nillable="true" type="ax21:ComponentContext"/>
++>>>>>>> upstream/master
<xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="multiTenant" type="xs:boolean"/>
<xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
@@@ -52,10 -52,10 +66,17 @@@
</xs:complexType>
<xs:complexType name="ComponentContext">
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="applicationClusterContexts" nillable="true" type="ax25:ApplicationClusterContext"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax25:CartridgeContext"/>
+ <xs:element minOccurs="0" name="dependencyContext" nillable="true" type="ax25:DependencyContext"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax25:GroupContext"/>
++=======
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="applicationClusterContexts" nillable="true" type="ax21:ApplicationClusterContext"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax21:CartridgeContext"/>
+ <xs:element minOccurs="0" name="dependencyContext" nillable="true" type="ax21:DependencyContext"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax21:GroupContext"/>
++>>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
<xs:complexType name="ApplicationClusterContext">
@@@ -66,8 -66,8 +87,13 @@@
<xs:element maxOccurs="unbounded" minOccurs="0" name="dependencyClusterIds" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="deploymentPolicyName" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="persistenceContext" nillable="true" type="ax25:PersistenceContext"/>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax26:Properties"/>
++=======
+ <xs:element minOccurs="0" name="persistenceContext" nillable="true" type="ax21:PersistenceContext"/>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax23:Properties"/>
++>>>>>>> upstream/master
<xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="textPayload" nillable="true" type="xs:string"/>
</xs:sequence>
@@@ -75,7 -75,7 +101,11 @@@
<xs:complexType name="PersistenceContext">
<xs:sequence>
<xs:element minOccurs="0" name="persistenceRequired" type="xs:boolean"/>
++<<<<<<< HEAD
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax25:VolumeContext"/>
++=======
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax21:VolumeContext"/>
++>>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
<xs:complexType name="VolumeContext">
@@@ -94,21 -94,21 +124,34 @@@
<xs:sequence>
<xs:element minOccurs="0" name="cartridgeMax" type="xs:int"/>
<xs:element minOccurs="0" name="cartridgeMin" type="xs:int"/>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax25:SubscribableInfoContext"/>
++=======
+ <xs:element minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax21:SubscribableInfoContext"/>
++>>>>>>> upstream/master
<xs:element minOccurs="0" name="type" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="SubscribableInfoContext">
<xs:sequence>
<xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"/>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="artifactRepositoryContext" nillable="true" type="ax25:ArtifactRepositoryContext"/>
++=======
+ <xs:element minOccurs="0" name="artifactRepositoryContext" nillable="true" type="ax21:ArtifactRepositoryContext"/>
++>>>>>>> upstream/master
<xs:element minOccurs="0" name="autoscalingPolicy" nillable="true" type="xs:string"/>
<xs:element maxOccurs="unbounded" minOccurs="0" name="dependencyAliases" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="maxMembers" type="xs:int"/>
<xs:element minOccurs="0" name="minMembers" type="xs:int"/>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="persistenceContext" nillable="true" type="ax25:PersistenceContext"/>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax26:Properties"/>
++=======
+ <xs:element minOccurs="0" name="persistenceContext" nillable="true" type="ax21:PersistenceContext"/>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax23:Properties"/>
++>>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
<xs:complexType name="ArtifactRepositoryContext">
@@@ -130,9 -130,9 +173,15 @@@
<xs:complexType name="GroupContext">
<xs:sequence>
<xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"/>
++<<<<<<< HEAD
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax25:CartridgeContext"/>
+ <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="xs:string"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax25:GroupContext"/>
++=======
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax21:CartridgeContext"/>
+ <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="xs:string"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax21:GroupContext"/>
++>>>>>>> upstream/master
<xs:element minOccurs="0" name="groupMaxInstances" type="xs:int"/>
<xs:element minOccurs="0" name="groupMinInstances" type="xs:int"/>
<xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
@@@ -156,69 -156,116 +205,156 @@@
</xs:sequence>
</xs:complexType>
</xs:schema>
++<<<<<<< HEAD
+ <xs:schema xmlns:ax29="http://application.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax27="http://pojo.applications.autoscaler.stratos.apache.org/xsd" xmlns:ax24="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax216="http://rmi.java/xsd" xmlns:ax218="http://policy.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax220="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ax222="http://pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax224="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax226="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.autoscaler.stratos.apache.org">
++=======
+ <xs:schema xmlns:ax26="http://application.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax24="http://pojo.applications.autoscaler.stratos.apache.org/xsd" xmlns:ax217="http://policy.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax219="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ax215="http://rmi.java/xsd" xmlns:ax222="http://pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax224="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax211="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax226="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.autoscaler.stratos.apache.org">
+ <xs:import namespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd"/>
+ <xs:import namespace="http://application.exception.autoscaler.stratos.apache.org/xsd"/>
++>>>>>>> upstream/master
<xs:import namespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"/>
+ <xs:import namespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd"/>
+ <xs:import namespace="http://application.exception.autoscaler.stratos.apache.org/xsd"/>
<xs:import namespace="http://rmi.java/xsd"/>
<xs:import namespace="http://policy.exception.autoscaler.stratos.apache.org/xsd"/>
<xs:import namespace="http://exception.autoscaler.stratos.apache.org/xsd"/>
<xs:import namespace="http://pojo.autoscaler.stratos.apache.org/xsd"/>
<xs:import namespace="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"/>
<xs:import namespace="http://common.stratos.apache.org/xsd"/>
++<<<<<<< HEAD
+ <xs:element name="getApplicationPolicy">
++=======
+ <xs:element name="getApplication">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getApplicationResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax24:ApplicationContext"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="AutoscalerServiceApplicationDefinitionException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax25:ApplicationDefinitionException"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="updateApplication">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax24:ApplicationContext"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="updateApplicationResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="deleteApplication">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="deleteApplicationResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getDeploymentPolicies">
++>>>>>>> upstream/master
<xs:complexType>
- <xs:sequence/>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/>
+ </xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getDeploymentPoliciesResponse">
+ <xs:element name="getApplicationPolicyResponse">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax24:ApplicationPolicy"/>
++=======
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax27:DeploymentPolicy"/>
++>>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceRemoteException">
+ <xs:element name="getApplication">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
++=======
+ <xs:element minOccurs="0" name="RemoteException" nillable="true" type="ax215:RemoteException"/>
++>>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceInvalidDeploymentPolicyException">
+ <xs:element name="getApplicationResponse">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax27:ApplicationContext"/>
++=======
+ <xs:element minOccurs="0" name="InvalidDeploymentPolicyException" nillable="true" type="ax217:InvalidDeploymentPolicyException"/>
++>>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceDeploymentPolicyNotExistsException">
+ <xs:element name="AutoscalerServiceApplicationDefinitionException">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax29:ApplicationDefinitionException"/>
++=======
+ <xs:element minOccurs="0" name="DeploymentPolicyNotExistsException" nillable="true" type="ax217:DeploymentPolicyNotExistsException"/>
++>>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceInvalidPolicyException">
+ <xs:element name="updateApplication">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax27:ApplicationContext"/>
++=======
+ <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax217:InvalidPolicyException"/>
++>>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceCloudControllerConnectionException">
+ <xs:element name="updateApplicationResponse">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
++=======
+ <xs:element minOccurs="0" name="CloudControllerConnectionException" nillable="true" type="ax219:CloudControllerConnectionException"/>
++>>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateDeploymentPolicy">
+ <xs:element name="deleteApplication">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
++=======
+ <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax27:DeploymentPolicy"/>
++>>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
</xs:element>
@@@ -229,22 -276,17 +365,30 @@@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceInvalidApplicationPolicyException">
+ <xs:element name="getDeploymentPolicies">
+ <xs:complexType>
+ <xs:sequence/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getDeploymentPoliciesResponse">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:DeploymentPolicy"/>
++=======
+ <xs:element minOccurs="0" name="InvalidApplicationPolicyException" nillable="true" type="ax25:InvalidApplicationPolicyException"/>
++>>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addApplicationPolicy">
+ <xs:element name="AutoscalerServiceRemoteException">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="RemoteException" nillable="true" type="ax216:RemoteException"/>
++=======
+ <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax27:ApplicationPolicy"/>
++>>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
</xs:element>
@@@ -269,17 -311,17 +413,25 @@@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceApplicatioinPolicyNotExistsException">
+ <xs:element name="AutoscalerServiceCloudControllerConnectionException">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="CloudControllerConnectionException" nillable="true" type="ax219:CloudControllerConnectionException"/>
++=======
+ <xs:element minOccurs="0" name="ApplicatioinPolicyNotExistsException" nillable="true" type="ax217:ApplicatioinPolicyNotExistsException"/>
++>>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateApplicationPolicy">
+ <xs:element name="updateDeploymentPolicy">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax24:DeploymentPolicy"/>
++=======
+ <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax27:ApplicationPolicy"/>
++>>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
</xs:element>
@@@ -290,31 -332,83 +442,97 @@@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationPolicies">
+ <xs:element name="AutoscalerServiceInvalidApplicationPolicyException">
<xs:complexType>
- <xs:sequence/>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="InvalidApplicationPolicyException" nillable="true" type="ax29:InvalidApplicationPolicyException"/>
+ </xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationPoliciesResponse">
+ <xs:element name="addApplicationPolicy">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax24:ApplicationPolicy"/>
++=======
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax27:ApplicationPolicy"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="serviceGroupExist">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="serviceName" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="serviceGroupExistResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="AutoscalerServiceAutoScalerException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="AutoScalerException" nillable="true" type="ax219:AutoScalerException"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getServiceGroups">
+ <xs:complexType>
+ <xs:sequence/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getServiceGroupsResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax221:ServiceGroup"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="AutoscalerServiceCartridgeGroupNotFoundException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="CartridgeGroupNotFoundException" nillable="true" type="ax219:CartridgeGroupNotFoundException"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="removeServiceGroup">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="groupName" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="removeServiceGroupResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
++>>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceAutoScalingPolicyAlreadyExistException">
+ <xs:element name="addApplicationPolicyResponse">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
++=======
+ <xs:element minOccurs="0" name="AutoScalingPolicyAlreadyExistException" nillable="true" type="ax219:AutoScalingPolicyAlreadyExistException"/>
++>>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addAutoScalingPolicy">
+ <xs:element name="removeApplicationPolicy">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/>
++=======
+ <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax223:AutoscalePolicy"/>
++>>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
</xs:element>
@@@ -325,17 -419,22 +543,25 @@@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getAutoScalingPolicies">
- <xs:complexType>
- <xs:sequence/>
- </xs:complexType>
- </xs:element>
- <xs:element name="getAutoScalingPoliciesResponse">
+ <xs:element name="AutoscalerServiceApplicatioinPolicyNotExistsException">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="ApplicatioinPolicyNotExistsException" nillable="true" type="ax217:ApplicatioinPolicyNotExistsException"/>
++=======
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax223:AutoscalePolicy"/>
++>>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateAutoScalingPolicy">
+ <xs:element name="updateApplicationPolicy">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax24:ApplicationPolicy"/>
++=======
+ <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax223:AutoscalePolicy"/>
++>>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
</xs:element>
@@@ -346,22 -445,17 +572,30 @@@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceUnremovablePolicyException">
+ <xs:element name="getApplicationPolicies">
+ <xs:complexType>
+ <xs:sequence/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getApplicationPoliciesResponse">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:ApplicationPolicy"/>
++=======
+ <xs:element minOccurs="0" name="UnremovablePolicyException" nillable="true" type="ax217:UnremovablePolicyException"/>
++>>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServicePolicyDoesNotExistException">
+ <xs:element name="AutoscalerServiceInvalidServiceGroupException">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax29:InvalidServiceGroupException"/>
++=======
+ <xs:element minOccurs="0" name="PolicyDoesNotExistException" nillable="true" type="ax217:PolicyDoesNotExistException"/>
++>>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
</xs:element>
@@@ -393,22 -487,18 +627,26 @@@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="deployApplication">
++<<<<<<< HEAD
+ <xs:element name="AutoscalerServiceAutoScalerException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="AutoScalerException" nillable="true" type="ax219:AutoScalerException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="deployApplicationResponse">
+ <xs:element name="getServiceGroups">
++=======
++ <xs:element name="deployApplication">
++>>>>>>> upstream/master
+ <xs:complexType>
+ <xs:sequence/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getServiceGroupsResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax221:ServiceGroup"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@@ -426,36 -517,39 +664,55 @@@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceInvalidArgumentException">
+ <xs:element name="removeServiceGroupResponse">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
++=======
+ <xs:element minOccurs="0" name="InvalidArgumentException" nillable="true" type="ax219:InvalidArgumentException"/>
++>>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateClusterMonitor">
+ <xs:element name="getApplications">
<xs:complexType>
++<<<<<<< HEAD
+ <xs:sequence/>
++=======
+ <xs:sequence>
+ <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax22:Properties"/>
+ </xs:sequence>
++>>>>>>> upstream/master
</xs:complexType>
</xs:element>
- <xs:element name="updateClusterMonitorResponse">
+ <xs:element name="getApplicationsResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax27:ApplicationContext"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceInvalidServiceGroupException">
+ <xs:element name="addApplication">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax27:ApplicationContext"/>
++=======
+ <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax25:InvalidServiceGroupException"/>
++>>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addServiceGroup">
+ <xs:element name="addApplicationResponse">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
++=======
+ <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax221:ServiceGroup"/>
++>>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
</xs:element>
@@@ -480,17 -575,10 +737,21 @@@
</xs:sequence>
</xs:complexType>
</xs:element>
++<<<<<<< HEAD
+ <xs:element name="getAutoscalingPolicyResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax223:AutoscalePolicy"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getDeploymentPolicy">
++=======
+ <xs:element name="getApplicationNetworkPartitions">
++>>>>>>> upstream/master
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@@ -501,17 -589,17 +762,25 @@@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceDeploymentPolicyAlreadyExistsException">
+ <xs:element name="AutoscalerServiceAutoScalingPolicyAlreadyExistException">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="AutoScalingPolicyAlreadyExistException" nillable="true" type="ax219:AutoScalingPolicyAlreadyExistException"/>
++=======
+ <xs:element minOccurs="0" name="DeploymentPolicyAlreadyExistsException" nillable="true" type="ax217:DeploymentPolicyAlreadyExistsException"/>
++>>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addDeployementPolicy">
+ <xs:element name="addAutoScalingPolicy">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax223:AutoscalePolicy"/>
++=======
+ <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax27:DeploymentPolicy"/>
++>>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
</xs:element>
@@@ -548,10 -624,10 +817,11 @@@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="undeployServiceGroup">
++<<<<<<< HEAD
+ <xs:element name="AutoscalerServiceUnremovablePolicyException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="UnremovablePolicyException" nillable="true" type="ax217:UnremovablePolicyException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@@ -605,104 -638,57 +875,144 @@@
</xs:sequence>
</xs:complexType>
</xs:element>
+ <xs:element name="undeployApplication">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="force" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="undeployApplicationResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="AutoscalerServiceInvalidArgumentException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="InvalidArgumentException" nillable="true" type="ax219:InvalidArgumentException"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="updateClusterMonitor">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax22:Properties"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="updateClusterMonitorResponse">
++=======
+ <xs:element name="getApplicationPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getApplicationPolicyResponse">
++>>>>>>> upstream/master
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax27:ApplicationPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
++<<<<<<< HEAD
+ <xs:element name="addServiceGroup">
++=======
+ <xs:element name="getApplications">
++>>>>>>> upstream/master
<xs:complexType>
- <xs:sequence/>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax221:ServiceGroup"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
++<<<<<<< HEAD
+ <xs:element name="addServiceGroupResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="findClusterId">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="findClusterIdResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>
+ </xs:sequence>
</xs:complexType>
</xs:element>
+ <xs:element name="getApplicationNetworkPartitions">
++=======
+ <xs:element name="getApplicationsResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:ApplicationContext"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="addApplication">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax24:ApplicationContext"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="addApplicationResponse">
++>>>>>>> upstream/master
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
++<<<<<<< HEAD
+ <xs:element name="getApplicationNetworkPartitionsResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
+ <xs:element name="AutoscalerServiceDeploymentPolicyAlreadyExistsException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="DeploymentPolicyAlreadyExistsException" nillable="true" type="ax217:DeploymentPolicyAlreadyExistsException"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="addDeployementPolicy">
++=======
+ <xs:element name="getServiceGroup">
++>>>>>>> upstream/master
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax24:DeploymentPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getServiceGroupResponse">
+ <xs:element name="addDeployementPolicyResponse">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
++=======
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax221:ServiceGroup"/>
++>>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
</xs:element>
@@@ -713,10 -699,10 +1023,14 @@@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getAutoscalingPolicyResponse">
+ <xs:element name="removeDeployementPolicyResponse">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
++=======
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax223:AutoscalePolicy"/>
++>>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
</xs:element>
@@@ -727,41 -713,41 +1041,66 @@@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getDeploymentPolicyResponse">
+ <xs:element name="undeployServiceGroupResponse">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
++=======
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax27:DeploymentPolicy"/>
++>>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:schema>
++<<<<<<< HEAD
+ <xs:schema xmlns:ax23="http://common.stratos.apache.org/xsd" xmlns:ax212="http://partition.common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd">
+ <xs:import namespace="http://common.stratos.apache.org/xsd"/>
+ <xs:import namespace="http://partition.common.stratos.apache.org/xsd"/>
++=======
+ <xs:schema xmlns:ax220="http://common.stratos.apache.org/xsd" xmlns:ax210="http://partition.common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd">
+ <xs:import namespace="http://partition.common.stratos.apache.org/xsd"/>
+ <xs:import namespace="http://common.stratos.apache.org/xsd"/>
+ <xs:complexType name="DeploymentPolicy">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionRefs" nillable="true" type="ax28:NetworkPartitionRef"/>
+ </xs:sequence>
+ </xs:complexType>
++>>>>>>> upstream/master
<xs:complexType name="ApplicationPolicy">
<xs:sequence>
<xs:element minOccurs="0" name="algorithm" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/>
<xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionGroups" nillable="true" type="xs:string"/>
<xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitions" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax23:Properties"/>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax22:Properties"/>
</xs:sequence>
</xs:complexType>
+ <xs:complexType name="DeploymentPolicy">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionRefs" nillable="true" type="ax212:NetworkPartitionRef"/>
+ </xs:sequence>
+ </xs:complexType>
</xs:schema>
++<<<<<<< HEAD
+ <xs:schema xmlns:ax211="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.common.stratos.apache.org/xsd">
++=======
+ <xs:schema xmlns:ax29="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.common.stratos.apache.org/xsd">
++>>>>>>> upstream/master
<xs:import namespace="http://common.stratos.apache.org/xsd"/>
<xs:complexType name="NetworkPartitionRef">
<xs:sequence>
<xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="partitionAlgo" nillable="true" type="xs:string"/>
++<<<<<<< HEAD
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="partitionRefs" nillable="true" type="ax210:PartitionRef"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax210:PartitionRef"/>
++=======
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="partitionRefs" nillable="true" type="ax28:PartitionRef"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax28:PartitionRef"/>
++>>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
<xs:complexType name="PartitionRef">
@@@ -770,7 -756,7 +1109,11 @@@
<xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="partitionMax" type="xs:int"/>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax211:Properties"/>
++=======
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax29:Properties"/>
++>>>>>>> upstream/master
</xs:sequence>
</xs:complexType>
</xs:schema>
@@@ -824,14 -810,14 +1167,22 @@@
</xs:complexType>
<xs:complexType name="UnremovablePolicyException">
<xs:complexContent>
++<<<<<<< HEAD
+ <xs:extension base="ax225:AutoScalerException">
++=======
+ <xs:extension base="ax218:AutoScalerException">
++>>>>>>> upstream/master
<xs:sequence/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="PolicyDoesNotExistException">
<xs:complexContent>
++<<<<<<< HEAD
+ <xs:extension base="ax225:AutoScalerException">
++=======
+ <xs:extension base="ax218:AutoScalerException">
++>>>>>>> upstream/master
<xs:sequence/>
</xs:extension>
</xs:complexContent>
[03/11] stratos git commit: Fixing the exception
Posted by im...@apache.org.
Fixing the exception
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/833f3609
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/833f3609
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/833f3609
Branch: refs/heads/master
Commit: 833f3609b842b0cd30066d252db709923b847ecc
Parents: 6cddb02
Author: Vishanth <vi...@gmail.com>
Authored: Thu May 14 00:15:08 2015 +0530
Committer: Vishanth <vi...@gmail.com>
Committed: Thu May 14 00:15:08 2015 +0530
----------------------------------------------------------------------
.../stratos/autoscaler/registry/RegistryManager.java | 8 +++++---
.../autoscaler/services/impl/AutoscalerServiceImpl.java | 10 +++++++++-
2 files changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/833f3609/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java
index 61a73ac..e16d3f5 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java
@@ -350,7 +350,7 @@ public class RegistryManager {
}
- public void updateServiceGroup(ServiceGroup serviceGroup) throws InvalidServiceGroupException {
+ public void updateServiceGroup(ServiceGroup serviceGroup) throws InvalidServiceGroupException, RegistryException {
try {
if (serviceGroup == null || StringUtils.isEmpty(serviceGroup.getName())) {
throw new IllegalArgumentException("Cartridge group or group name cannot be null");
@@ -366,8 +366,10 @@ public class RegistryManager {
log.debug(String.format("Updated cartridge group: [group-name] %s", serviceGroup.getName()));
}
} catch (Exception e) {
- log.error((String.format("Unable to update cartridge group [group-name] %s",
- serviceGroup.getName())), e);
+ String message = (String.format("Unable to update cartridge group [group-name] %s",
+ serviceGroup.getName()));
+ log.error(message, e);
+ throw new RegistryException(message, e);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/833f3609/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
index 248b2a4..cd7e7dc 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
@@ -702,7 +702,15 @@ public class AutoscalerServiceImpl implements AutoscalerService {
}
}
- RegistryManager.getInstance().updateServiceGroup(cartridgeGroup);
+ try {
+ RegistryManager.getInstance().updateServiceGroup(cartridgeGroup);
+ } catch (org.wso2.carbon.registry.core.exceptions.RegistryException e) {
+ String message = (String.format("Cannot update cartridge group: [group-name] %s",
+ cartridgeGroup.getName()));
+ throw new RuntimeException(message, e);
+ }
+
+
if (log.isInfoEnabled()) {
log.info(String.format("Cartridge group successfully updated: [group-name] %s", cartridgeGroup.getName()));
}