http://git-wip-us.apache.org/repos/asf/stratos/blob/aadd589f/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
----------------------------------------------------------------------
diff --cc
service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
index f528064,4c17dd5..c898b3f
---
a/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
+++
b/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
@@@ -1,61 -1,56 +1,85 @@@
++<<<<<<< HEAD
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
xmlns:ax220="http://exception.controller.cloud.stratos.apache.org/xsd";
xmlns:ns1="http://org.apache.axis2/xsd";
xmlns:ns="http://impl.controller.cloud.stratos.apache.org";
xmlns:ax222="http://partition.deployment.controller.cloud.stratos.apache.org/xsd";
xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl";
xmlns:http="http://schemas.xmlsoap.org/wsdl/http/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:ax218="http://pojo.controller.cloud.stratos.apache.org/xsd";
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/";
xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/";
targetNamespace="http://impl.controller.cloud.stratos.apache.org";>
++=======
+ <wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
xmlns:ax220="http://partition.deployment.controller.cloud.stratos.apache.org/xsd";
xmlns:ns1="http://org.apache.axis2/xsd";
xmlns:ax221="http://pojo.controller.cloud.stratos.apache.org/xsd";
xmlns:ns="http://impl.controller.cloud.stratos.apache.org";
xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl";
xmlns:http="http://schemas.xmlsoap.org/wsdl/http/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:ax218="http://exception.controller.cloud.stratos.apache.org/xsd";
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/";
xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/";
targetNamespace="http://impl.controller.cloud.stratos.apache.org";>
++>>>>>>> master
<wsdl:documentation>CloudControllerService</wsdl:documentation>
<wsdl:types>
<xs:schema attributeFormDefault="qualified"
elementFormDefault="qualified"
targetNamespace="http://exception.controller.cloud.stratos.apache.org/xsd";>
- <xs:complexType name="InvalidPartitionException">
+ <xs:complexType name="InvalidCartridgeDefinitionException">
<xs:sequence>
- <xs:element minOccurs="0" name="message" nillable="true"
type="xs:string"/>
+ <xs:element minOccurs="0" name="message" nillable="true"
type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
++<<<<<<< HEAD
+ <xs:complexType name="InvalidIaasProviderException">
++=======
+ <xs:complexType name="InvalidCartridgeTypeException">
++>>>>>>> master
<xs:sequence>
- <xs:element minOccurs="0" name="message" nillable="true"
type="xs:string"/>
+ <xs:element minOccurs="0" name="message" nillable="true"
type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="UnregisteredCartridgeException">
+ <xs:complexType name="UnregisteredClusterException">
<xs:sequence>
- <xs:element minOccurs="0" name="message" nillable="true"
type="xs:string"/>
+ <xs:element minOccurs="0" name="message" nillable="true"
type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
++<<<<<<< HEAD
+ <xs:complexType
name="InvalidCompositeApplicationDefinitionException">
++=======
+ <xs:complexType name="InvalidMemberException">
++>>>>>>> master
<xs:sequence>
- <xs:element minOccurs="0" name="message" nillable="true"
type="xs:string"/>
+ <xs:element minOccurs="0" name="message" nillable="true"
type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
++<<<<<<< HEAD
+ <xs:complexType name="InvalidPartitionException">
++=======
+ <xs:complexType name="InvalidClusterException">
++>>>>>>> master
<xs:sequence>
- <xs:element minOccurs="0" name="message" nillable="true"
type="xs:string"/>
+ <xs:element minOccurs="0" name="message" nillable="true"
type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="InvalidCartridgeTypeException">
+ <xs:complexType name="UnregisteredCartridgeException">
<xs:sequence>
- <xs:element minOccurs="0" name="message" nillable="true"
type="xs:string"/>
+ <xs:element minOccurs="0" name="message" nillable="true"
type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="InvalidMemberException">
+ <xs:complexType name="InvalidIaasProviderException">
<xs:sequence>
- <xs:element minOccurs="0" name="message" nillable="true"
type="xs:string"/>
+ <xs:element minOccurs="0" name="message" nillable="true"
type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="InvalidClusterException">
+ <xs:complexType name="InvalidCartridgeDefinitionException">
<xs:sequence>
- <xs:element minOccurs="0" name="message" nillable="true"
type="xs:string"/>
+ <xs:element minOccurs="0" name="message" nillable="true"
type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="UnregisteredClusterException">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="message" nillable="true"
type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:schema>
++<<<<<<< HEAD
+ <xs:schema
xmlns:ax219="http://pojo.controller.cloud.stratos.apache.org/xsd";
xmlns:ax221="http://exception.controller.cloud.stratos.apache.org/xsd";
xmlns:ax224="http://partition.deployment.controller.cloud.stratos.apache.org/xsd";
attributeFormDefault="qualified" elementFormDefault="qualified"
targetNamespace="http://impl.controller.cloud.stratos.apache.org";>
+ <xs:import
namespace="http://pojo.controller.cloud.stratos.apache.org/xsd";></xs:import>
+ <xs:import
namespace="http://exception.controller.cloud.stratos.apache.org/xsd";></xs:import>
+ <xs:import
namespace="http://partition.deployment.controller.cloud.stratos.apache.org/xsd";></xs:import>
+ <xs:element name="getClusterContext">
++=======
+ <xs:schema
xmlns:ax219="http://exception.controller.cloud.stratos.apache.org/xsd";
xmlns:ax223="http://partition.deployment.controller.cloud.stratos.apache.org/xsd";
xmlns:ax225="http://pojo.controller.cloud.stratos.apache.org/xsd";
attributeFormDefault="qualified" elementFormDefault="qualified"
targetNamespace="http://impl.controller.cloud.stratos.apache.org";>
+ <xs:import
namespace="http://exception.controller.cloud.stratos.apache.org/xsd"/>
+ <xs:import
namespace="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"/>
+ <xs:import
namespace="http://pojo.controller.cloud.stratos.apache.org/xsd"/>
+ <xs:element
name="CloudControllerServiceInvalidPartitionException">
++>>>>>>> master
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0"
name="InvalidPartitionException" nillable="true"
type="ax219:InvalidPartitionException"/>
+ <xs:element minOccurs="0" name="clusterId"
nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
@@@ -73,95 -68,88 +97,159 @@@
</xs:sequence>
</xs:complexType>
</xs:element>
++<<<<<<< HEAD
+ <xs:element
name="CloudControllerServiceInvalidIaasProviderException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0"
name="InvalidIaasProviderException" nillable="true"
type="ax220:InvalidIaasProviderException"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="deployCartridgeDefinition">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="cartridgeConfig"
nillable="true" type="ax219:CartridgeConfig"></xs:element>
++=======
+ <xs:element
name="CloudControllerServiceInvalidCartridgeTypeException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0"
name="InvalidCartridgeTypeException" nillable="true"
type="ax219:InvalidCartridgeTypeException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element
name="CloudControllerServiceUnregisteredCartridgeException">
+ <xs:element name="validateDeploymentPolicy">
<xs:complexType>
<xs:sequence>
+ <xs:element minOccurs="0" name="cartridgeType"
nillable="true" type="xs:string"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0"
name="partitions" nillable="true" type="ax220:Partition"/>
++>>>>>>> master
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="validateDeploymentPolicyResponse">
+ <xs:complexType>
+ <xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0"
name="UnregisteredCartridgeException" nillable="true"
type="ax220:UnregisteredCartridgeException"></xs:element>
++=======
+ <xs:element minOccurs="0" name="return"
type="xs:boolean"/>
++>>>>>>> master
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getCartridgeInfo">
+ <xs:element
name="CloudControllerServiceUnregisteredClusterException">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="cartridgeType"
nillable="true" type="xs:string"></xs:element>
++=======
+ <xs:element minOccurs="0"
name="UnregisteredClusterException" nillable="true"
type="ax219:UnregisteredClusterException"/>
++>>>>>>> master
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getCartridgeInfoResponse">
+ <xs:element name="unregisterService">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="return"
nillable="true" type="ax219:CartridgeInfo"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element
name="CloudControllerServiceInvalidCompositeApplicationDefinitionException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0"
name="InvalidCompositeApplicationDefinitionException" nillable="true"
type="ax220:InvalidCompositeApplicationDefinitionException"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="deployCompositeApplicationDefinition">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0"
name="compositeApplicationDefinition" nillable="true"
type="ax219:CompositeApplicationDefinition"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element
name="CloudControllerServiceInvalidPartitionException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0"
name="InvalidPartitionException" nillable="true"
type="ax220:InvalidPartitionException"></xs:element>
++=======
+ <xs:element minOccurs="0" name="clusterId"
nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element
name="CloudControllerServiceInvalidCartridgeTypeException">
+ <xs:element name="undeployCartridgeDefinition">
<xs:complexType>
<xs:sequence>
+ <xs:element minOccurs="0" name="cartridgeType"
nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="CloudControllerServiceInvalidMemberException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0"
name="InvalidMemberException" nillable="true"
type="ax219:InvalidMemberException"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="terminateInstance">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="memberId"
nillable="true" type="xs:string"/>
++>>>>>>> master
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="CloudControllerServiceInvalidClusterException">
+ <xs:complexType>
+ <xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0"
name="InvalidCartridgeTypeException" nillable="true"
type="ax220:InvalidCartridgeTypeException"></xs:element>
++=======
+ <xs:element minOccurs="0"
name="InvalidClusterException" nillable="true"
type="ax219:InvalidClusterException"/>
++>>>>>>> master
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="validateDeploymentPolicy">
+ <xs:element name="terminateAllInstances">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="cartridgeType"
nillable="true" type="xs:string"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0"
name="partitions" nillable="true" type="ax222:Partition"></xs:element>
++=======
+ <xs:element minOccurs="0" name="clusterId"
nillable="true" type="xs:string"/>
++>>>>>>> master
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="validateDeploymentPolicyResponse">
+ <xs:element
name="CloudControllerServiceUnregisteredCartridgeException">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="return"
type="xs:boolean"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="unDeployCompositeApplicationDefinition">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="appAlias"
nillable="true" type="xs:string"></xs:element>
++=======
+ <xs:element minOccurs="0"
name="UnregisteredCartridgeException" nillable="true"
type="ax219:UnregisteredCartridgeException"/>
++>>>>>>> master
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="undeployCartridgeDefinition">
+ <xs:element
name="CloudControllerServiceInvalidIaasProviderException">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="cartridgeType"
nillable="true" type="xs:string"></xs:element>
++=======
+ <xs:element minOccurs="0"
name="InvalidIaasProviderException" nillable="true"
type="ax219:InvalidIaasProviderException"/>
++>>>>>>> master
</xs:sequence>
</xs:complexType>
</xs:element>
@@@ -179,31 -167,17 +267,42 @@@
</xs:sequence>
</xs:complexType>
</xs:element>
++<<<<<<< HEAD
+ <xs:element name="CloudControllerServiceInvalidMemberException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0"
name="InvalidMemberException" nillable="true"
type="ax220:InvalidMemberException"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="terminateInstance">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="memberId"
nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="CloudControllerServiceInvalidClusterException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0"
name="InvalidClusterException" nillable="true"
type="ax220:InvalidClusterException"></xs:element>
++=======
+ <xs:element name="registerService">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="registrant"
nillable="true" type="ax221:Registrant"/>
++>>>>>>> master
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="terminateAllInstances">
+ <xs:element name="registerServiceResponse">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="clusterId"
nillable="true" type="xs:string"></xs:element>
++=======
+ <xs:element minOccurs="0" name="return"
type="xs:boolean"/>
++>>>>>>> master
</xs:sequence>
</xs:complexType>
</xs:element>
@@@ -247,222 -207,206 +346,343 @@@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="registerService">
+ <xs:element name="getCartridgeInfo">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="registrant"
nillable="true" type="ax219:Registrant"></xs:element>
++=======
+ <xs:element minOccurs="0" name="cartridgeType"
nillable="true" type="xs:string"/>
++>>>>>>> master
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="registerServiceResponse">
+ <xs:element name="getCartridgeInfoResponse">
<xs:complexType>
<xs:sequence>
++<<<<<<< HEAD
+ <xs:element minOccurs="0" name="return"
type="xs:boolean"></xs:element>
++=======
+ <xs:element minOccurs="0" name="return"
nillable="true" type="ax221:CartridgeInfo"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element
name="CloudControllerServiceInvalidCartridgeDefinitionException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0"
name="InvalidCartridgeDefinitionException" nillable="true"
type="ax219:InvalidCartridgeDefinitionException"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="deployCartridgeDefinition">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="cartridgeConfig"
nillable="true" type="ax221:CartridgeConfig"/>
++>>>>>>> master
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:schema>
++<<<<<<< HEAD
+ <xs:schema
xmlns:ax223="http://pojo.controller.cloud.stratos.apache.org/xsd";
attributeFormDefault="qualified" elementFormDefault="qualified"
targetNamespace="http://partition.deployment.controller.cloud.stratos.apache.org/xsd";>
+ <xs:import
namespace="http://pojo.controller.cloud.stratos.apache.org/xsd";></xs:import>
+ <xs:complexType name="Partition">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="id" nillable="true"
type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="partitionMax"
type="xs:int"></xs:element>
+ <xs:element minOccurs="0" name="partitionMin"
type="xs:int"></xs:element>
+ <xs:element minOccurs="0" name="properties"
nillable="true" type="ax218:Properties"></xs:element>
+ <xs:element minOccurs="0" name="provider" nillable="true"
type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:schema>
+ <xs:schema
xmlns:ax225="http://partition.deployment.controller.cloud.stratos.apache.org/xsd";
attributeFormDefault="qualified" elementFormDefault="qualified"
targetNamespace="http://pojo.controller.cloud.stratos.apache.org/xsd";>
+ <xs:import
namespace="http://partition.deployment.controller.cloud.stratos.apache.org/xsd";></xs:import>
+ <xs:complexType name="ClusterContext">
++=======
+ <xs:schema
xmlns:ax224="http://partition.deployment.controller.cloud.stratos.apache.org/xsd";
attributeFormDefault="qualified" elementFormDefault="qualified"
targetNamespace="http://pojo.controller.cloud.stratos.apache.org/xsd";>
+ <xs:import
namespace="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"/>
+ <xs:complexType name="Properties">
++>>>>>>> master
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
name="properties" nillable="true" type="ax221:Property"/>
+ <xs:element minOccurs="0" name="cartridgeType"
nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="clusterId"
nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="hostName" nillable="true"
type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="lbCluster"
type="xs:boolean"></xs:element>
+ <xs:element minOccurs="0" name="payload" nillable="true"
type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="timeoutInMillis"
type="xs:long"></xs:element>
+ <xs:element minOccurs="0" name="volumeRequired"
type="xs:boolean"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0"
name="volumes" nillable="true" type="ax218:Volume"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="Property">
+ <xs:complexType name="Volume">
<xs:sequence>
- <xs:element minOccurs="0" name="name" nillable="true"
type="xs:string"/>
- <xs:element minOccurs="0" name="value" nillable="true"
type="xs:string"/>
+ <xs:element minOccurs="0" name="device" nillable="true"
type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="iaasType" nillable="true"
type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="id" nillable="true"
type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="mappingPath"
nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="removeOntermination"
type="xs:boolean"></xs:element>
+ <xs:element minOccurs="0" name="size"
type="xs:int"></xs:element>
+ <xs:element minOccurs="0" name="snapshotId"
nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="volumeId" nillable="true"
type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
++<<<<<<< HEAD
+ <xs:complexType name="CartridgeConfig">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="baseDir" nillable="true"
type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="defaultAutoscalingPolicy"
nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="defaultDeploymentPolicy"
nillable="true" type="xs:string"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0"
name="deploymentDirs" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="description"
nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="displayName"
nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="hostName" nillable="true"
type="xs:string"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0"
name="iaasConfigs" nillable="true" type="ax218:IaasConfig"></xs:element>
+ <xs:element minOccurs="0" name="lbConfig" nillable="true"
type="ax218:LoadbalancerConfig"></xs:element>
+ <xs:element minOccurs="0" name="multiTenant"
type="xs:boolean"></xs:element>
+ <xs:element minOccurs="0" name="persistence"
nillable="true" type="ax218:Persistence"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0"
name="portMappings" nillable="true" type="ax218:PortMapping"></xs:element>
+ <xs:element minOccurs="0" name="properties"
nillable="true" type="ax218:Properties"></xs:element>
+ <xs:element minOccurs="0" name="provider" nillable="true"
type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="serviceGroup"
nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="type" nillable="true"
type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="version" nillable="true"
type="xs:string"></xs:element>
++=======
+ <xs:complexType name="MemberContext">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="allocatedIpAddress"
nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="cartridgeType"
nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="clusterId"
nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="initTime" type="xs:long"/>
+ <xs:element minOccurs="0" name="instanceId"
nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="lbClusterId"
nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="memberId" nillable="true"
type="xs:string"/>
+ <xs:element minOccurs="0" name="networkPartitionId"
nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="nodeId" nillable="true"
type="xs:string"/>
+ <xs:element minOccurs="0" name="partition"
nillable="true" type="ax220:Partition"/>
+ <xs:element minOccurs="0" name="privateIpAddress"
nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="properties"
nillable="true" type="ax221:Properties"/>
+ <xs:element minOccurs="0" name="publicIpAddress"
nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="Registrant">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="autoScalerPolicyName"
nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="cartridgeType"
nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="clusterId"
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="payload" nillable="true"
type="xs:string"/>
+ <xs:element minOccurs="0" name="persistence"
nillable="true" type="ax221:Persistence"/>
+ <xs:element minOccurs="0" name="properties"
nillable="true" type="ax221:Properties"/>
+ <xs:element minOccurs="0" name="tenantRange"
nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="Persistence">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="persistanceRequired"
type="xs:boolean"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0"
name="volumes" nillable="true" type="ax221:Volume"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="Volume">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="device" nillable="true"
type="xs:string"/>
+ <xs:element minOccurs="0" name="iaasType" nillable="true"
type="xs:string"/>
+ <xs:element minOccurs="0" name="id" nillable="true"
type="xs:string"/>
+ <xs:element minOccurs="0" name="mappingPath"
nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="removeOntermination"
type="xs:boolean"/>
+ <xs:element minOccurs="0" name="size" type="xs:int"/>
+ <xs:element minOccurs="0" name="snapshotId"
nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="volumeId" nillable="true"
type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="ClusterContext">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="cartridgeType"
nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="clusterId"
nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="hostName" nillable="true"
type="xs:string"/>
+ <xs:element minOccurs="0" name="lbCluster"
type="xs:boolean"/>
+ <xs:element minOccurs="0" name="payload" nillable="true"
type="xs:string"/>
+ <xs:element minOccurs="0" name="timeoutInMillis"
type="xs:long"/>
+ <xs:element minOccurs="0" name="volumeRequired"
type="xs:boolean"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0"
name="volumes" nillable="true" type="ax221:Volume"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="CartridgeInfo">
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0"
name="appTypes" nillable="true" type="ax221:AppType"/>
+ <xs:element minOccurs="0" name="baseDir" nillable="true"
type="xs:string"/>
+ <xs:element minOccurs="0" name="defaultAutoscalingPolicy"
nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="defaultDeploymentPolicy"
nillable="true" type="xs:string"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0"
name="deploymentDirs" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="description"
nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="displayName"
nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="hostName" nillable="true"
type="xs:string"/>
+ <xs:element minOccurs="0" name="lbConfig" nillable="true"
type="ax221:LoadbalancerConfig"/>
+ <xs:element minOccurs="0" name="multiTenant"
type="xs:boolean"/>
+ <xs:element minOccurs="0" name="persistence"
nillable="true" type="ax221:Persistence"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0"
name="portMappings" nillable="true" type="ax221:PortMapping"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0"
name="properties" nillable="true" type="ax221:Property"/>
+ <xs:element minOccurs="0" name="provider" nillable="true"
type="xs:string"/>
+ <xs:element minOccurs="0" name="serviceGroup"
nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="type" nillable="true"
type="xs:string"/>
+ <xs:element minOccurs="0" name="version" nillable="true"
type="xs:string"/>
++>>>>>>> master
</xs:sequence>
</xs:complexType>
- <xs:complexType name="AppType">
+ <xs:complexType name="IaasConfig">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="className"
nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="credential"
nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="identity" nillable="true"
type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="imageId" nillable="true"
type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="maxInstanceLimit"
type="xs:int"></xs:element>
+ <xs:element minOccurs="0" name="name" nillable="true"
type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="networkInterfaces"
nillable="true" type="ax218:NetworkInterfaces"></xs:element>
+ <xs:element minOccurs="0" name="payload" nillable="true"
type="xs:base64Binary"></xs:element>
+ <xs:element minOccurs="0" name="properties"
nillable="true" type="ax218:Properties"></xs:element>
+ <xs:element minOccurs="0" name="provider" nillable="true"
type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="type" nillable="true"
type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="NetworkInterfaces">
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0"
name="networkInterfaces" nillable="true"
type="ax218:NetworkInterface"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="NetworkInterface">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="fixedIp" nillable="true"
type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="networkUuid"
nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="portUuid" nillable="true"
type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="Properties">
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0"
name="properties" nillable="true" type="ax218:Property"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="Property">
<xs:sequence>
- <xs:element minOccurs="0" name="appSpecificMapping"
type="xs:boolean"/>
- <xs:element minOccurs="0" name="name" nillable="true"
type="xs:string"/>
+ <xs:element minOccurs="0" name="name" nillable="true"
type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="value" nillable="true"
type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="LoadbalancerConfig">
<xs:sequence>
- <xs:element minOccurs="0" name="properties"
nillable="true" type="ax221:Properties"/>
- <xs:element minOccurs="0" name="type" nillable="true"
type="xs:string"/>
+ <xs:element minOccurs="0" name="properties"
nillable="true" type="ax218:Properties"></xs:element>
+ <xs:element minOccurs="0" name="type" nillable="true"
type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
++<<<<<<< HEAD
+ <xs:complexType name="Persistence">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="persistanceRequired"
type="xs:boolean"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0"
name="volumes" nillable="true" type="ax218:Volume"></xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="PortMapping">
<xs:sequence>
- <xs:element minOccurs="0" name="port" nillable="true"
type="xs:string"/>
- <xs:element minOccurs="0" name="protocol" nillable="true"
type="xs:string"/>
- <xs:element minOccurs="0" name="proxyPort"
nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="port" nillable="true"
type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="protocol" nillable="true"
type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="proxyPort"
nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="CartridgeConfig">
+ <xs:complexType name="CartridgeInfo">
++=======
++ <xs:complexType name="PortMapping">
++>>>>>>> master
<xs:sequence>
- <xs:element minOccurs="0" name="baseDir" nillable="true"
type="xs:string"/>
- <xs:element minOccurs="0" name="defaultAutoscalingPolicy"
nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="defaultDeploymentPolicy"
nillable="true" type="xs:string"/>
- <xs:element maxOccurs="unbounded" minOccurs="0"
name="deploymentDirs" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="description"
nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="displayName"
nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="hostName" nillable="true"
type="xs:string"/>
- <xs:element maxOccurs="unbounded" minOccurs="0"
name="iaasConfigs" nillable="true" type="ax221:IaasConfig"/>
- <xs:element minOccurs="0" name="lbConfig" nillable="true"
type="ax221:LoadbalancerConfig"/>
- <xs:element minOccurs="0" name="multiTenant"
type="xs:boolean"/>
- <xs:element minOccurs="0" name="persistence"
nillable="true" type="ax221:Persistence"/>
- <xs:element maxOccurs="unbounded" minOccurs="0"
name="portMappings" nillable="true" type="ax221:PortMapping"/>
- <xs:element minOccurs="0" name="properties"
nillable="true" type="ax221:Properties"/>
- <xs:element minOccurs="0" name="provider" nillable="true"
type="xs:string"/>
- <xs:element minOccurs="0" name="serviceGroup"
nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="type" nillable="true"
type="xs:string"/>
- <xs:element minOccurs="0" name="version" nillable="true"
type="xs:string"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0"
name="appTypes" nillable="true" type="ax218:AppType"></xs:element>
+ <xs:element minOccurs="0" name="baseDir" nillable="true"
type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="defaultAutoscalingPolicy"
nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="defaultDeploymentPolicy"
nillable="true" type="xs:string"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0"
name="deploymentDirs" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="description"
nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="displayName"
nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="hostName" nillable="true"
type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="lbConfig" nillable="true"
type="ax218:LoadbalancerConfig"></xs:element>
+ <xs:element minOccurs="0" name="multiTenant"
type="xs:boolean"></xs:element>
+ <xs:element minOccurs="0" name="persistence"
nillable="true" type="ax218:Persistence"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0"
name="portMappings" nillable="true" type="ax218:PortMapping"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0"
name="properties" nillable="true" type="ax218:Property"></xs:element>
+ <xs:element minOccurs="0" name="provider" nillable="true"
type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="type" nillable="true"
type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="version" nillable="true"
type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="IaasConfig">
+ <xs:complexType name="AppType">
<xs:sequence>
- <xs:element minOccurs="0" name="className"
nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="credential"
nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="identity" nillable="true"
type="xs:string"/>
- <xs:element minOccurs="0" name="imageId" nillable="true"
type="xs:string"/>
- <xs:element minOccurs="0" name="maxInstanceLimit"
type="xs:int"/>
- <xs:element minOccurs="0" name="name" nillable="true"
type="xs:string"/>
- <xs:element minOccurs="0" name="networkInterfaces"
nillable="true" type="ax221:NetworkInterfaces"/>
- <xs:element minOccurs="0" name="payload" nillable="true"
type="xs:base64Binary"/>
- <xs:element minOccurs="0" name="properties"
nillable="true" type="ax221:Properties"/>
- <xs:element minOccurs="0" name="provider" nillable="true"
type="xs:string"/>
- <xs:element minOccurs="0" name="type" nillable="true"
type="xs:string"/>
+ <xs:element minOccurs="0" name="appSpecificMapping"
type="xs:boolean"></xs:element>
+ <xs:element minOccurs="0" name="name" nillable="true"
type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="NetworkInterfaces">
+ <xs:complexType name="CompositeApplicationDefinition">
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
name="networkInterfaces" nillable="true" type="ax221:NetworkInterface"/>
+ <xs:element minOccurs="0" name="alias" nillable="true"
type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="applicationId"
nillable="true" type="xs:string"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0"
name="cartridges" nillable="true" type="ax218:ConfigCartridge"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0"
name="components" nillable="true" type="ax218:ConfigGroup"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="NetworkInterface">
+ <xs:complexType name="ConfigCartridge">
<xs:sequence>
- <xs:element minOccurs="0" name="fixedIp" nillable="true"
type="xs:string"/>
- <xs:element minOccurs="0" name="networkUuid"
nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="portUuid" nillable="true"
type="xs:string"/>
+ <xs:element minOccurs="0" name="alias" nillable="true"
type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
+ <xs:complexType name="ConfigGroup">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="alias" nillable="true"
type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="dependencies"
nillable="true" type="ax218:ConfigDependencies"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0"
name="subscribables" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
++<<<<<<< HEAD
+ <xs:complexType name="ConfigDependencies">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="kill_behavior"
nillable="true" type="xs:string"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0"
name="startup_order" nillable="true"
type="ax218:ConfigDependencyPair"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="ConfigDependencyPair">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="key" nillable="true"
type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="value" nillable="true"
type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="MemberContext">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="allocatedIpAddress"
nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="cartridgeType"
nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="clusterId"
nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="initTime"
type="xs:long"></xs:element>
+ <xs:element minOccurs="0" name="instanceId"
nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="lbClusterId"
nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="memberId" nillable="true"
type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="networkPartitionId"
nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="nodeId" nillable="true"
type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="partition"
nillable="true" type="ax222:Partition"></xs:element>
+ <xs:element minOccurs="0" name="privateIpAddress"
nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="publicIpAddress"
nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="Registrant">
++=======
+ </xs:schema>
+ <xs:schema
xmlns:ax222="http://pojo.controller.cloud.stratos.apache.org/xsd";
attributeFormDefault="qualified" elementFormDefault="qualified"
targetNamespace="http://partition.deployment.controller.cloud.stratos.apache.org/xsd";>
+ <xs:import
namespace="http://pojo.controller.cloud.stratos.apache.org/xsd"/>
+ <xs:complexType name="Partition">
++>>>>>>> master
<xs:sequence>
- <xs:element minOccurs="0" name="id" nillable="true"
type="xs:string"/>
- <xs:element minOccurs="0" name="partitionMax"
type="xs:int"/>
- <xs:element minOccurs="0" name="partitionMin"
type="xs:int"/>
- <xs:element minOccurs="0" name="properties"
nillable="true" type="ax221:Properties"/>
- <xs:element minOccurs="0" name="provider" nillable="true"
type="xs:string"/>
+ <xs:element minOccurs="0" name="autoScalerPolicyName"
nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="cartridgeType"
nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="clusterId"
nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="deploymentPolicyName"
nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="hostName" nillable="true"
type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="payload" nillable="true"
type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="persistence"
nillable="true" type="ax218:Persistence"></xs:element>
+ <xs:element minOccurs="0" name="properties"
nillable="true" type="ax218:Properties"></xs:element>
+ <xs:element minOccurs="0" name="tenantRange"
nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:schema>
@@@ -641,54 -566,54 +861,69 @@@
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="validateDeploymentPolicy">
- <soap:operation soapAction="urn:validateDeploymentPolicy"
style="document"/>
+ <soap:operation soapAction="urn:validateDeploymentPolicy"
style="document"></soap:operation>
<wsdl:input>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:input>
<wsdl:output>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:output>
<wsdl:fault
name="CloudControllerServiceInvalidPartitionException">
- <soap:fault use="literal"
name="CloudControllerServiceInvalidPartitionException"/>
+ <soap:fault use="literal"
name="CloudControllerServiceInvalidPartitionException"></soap:fault>
</wsdl:fault>
<wsdl:fault
name="CloudControllerServiceInvalidCartridgeTypeException">
- <soap:fault use="literal"
name="CloudControllerServiceInvalidCartridgeTypeException"/>
+ <soap:fault use="literal"
name="CloudControllerServiceInvalidCartridgeTypeException"></soap:fault>
</wsdl:fault>
</wsdl:operation>
++<<<<<<< HEAD
+ <wsdl:operation name="terminateInstance">
+ <soap:operation soapAction="urn:terminateInstance"
style="document"></soap:operation>
+ <wsdl:input>
+ <soap:body use="literal"></soap:body>
+ </wsdl:input>
+ <wsdl:fault name="CloudControllerServiceInvalidMemberException">
+ <soap:fault use="literal"
name="CloudControllerServiceInvalidMemberException"></soap:fault>
+ </wsdl:fault>
+ <wsdl:fault
name="CloudControllerServiceInvalidCartridgeTypeException">
+ <soap:fault use="literal"
name="CloudControllerServiceInvalidCartridgeTypeException"></soap:fault>
+ </wsdl:fault>
+ </wsdl:operation>
++=======
++>>>>>>> master
<wsdl:operation name="registerService">
- <soap:operation soapAction="urn:registerService"
style="document"/>
+ <soap:operation soapAction="urn:registerService"
style="document"></soap:operation>
<wsdl:input>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:input>
<wsdl:output>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:output>
<wsdl:fault
name="CloudControllerServiceUnregisteredCartridgeException">
- <soap:fault use="literal"
name="CloudControllerServiceUnregisteredCartridgeException"/>
+ <soap:fault use="literal"
name="CloudControllerServiceUnregisteredCartridgeException"></soap:fault>
</wsdl:fault>
</wsdl:operation>
+ <wsdl:operation name="terminateInstance">
+ <soap:operation soapAction="urn:terminateInstance"
style="document"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:fault name="CloudControllerServiceInvalidMemberException">
+ <soap:fault use="literal"
name="CloudControllerServiceInvalidMemberException"/>
+ </wsdl:fault>
+ <wsdl:fault
name="CloudControllerServiceInvalidCartridgeTypeException">
+ <soap:fault use="literal"
name="CloudControllerServiceInvalidCartridgeTypeException"/>
+ </wsdl:fault>
+ </wsdl:operation>
<wsdl:operation name="deployCartridgeDefinition">
- <soap:operation soapAction="urn:deployCartridgeDefinition"
style="document"/>
+ <soap:operation soapAction="urn:deployCartridgeDefinition"
style="document"></soap:operation>
<wsdl:input>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:input>
<wsdl:fault
name="CloudControllerServiceInvalidCartridgeDefinitionException">
- <soap:fault use="literal"
name="CloudControllerServiceInvalidCartridgeDefinitionException"/>
+ <soap:fault use="literal"
name="CloudControllerServiceInvalidCartridgeDefinitionException"></soap:fault>
</wsdl:fault>
<wsdl:fault
name="CloudControllerServiceInvalidIaasProviderException">
- <soap:fault use="literal"
name="CloudControllerServiceInvalidIaasProviderException"/>
+ <soap:fault use="literal"
name="CloudControllerServiceInvalidIaasProviderException"></soap:fault>
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="getCartridgeInfo">
@@@ -803,54 -704,54 +1038,69 @@@
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="validateDeploymentPolicy">
- <soap12:operation soapAction="urn:validateDeploymentPolicy"
style="document"/>
+ <soap12:operation soapAction="urn:validateDeploymentPolicy"
style="document"></soap12:operation>
<wsdl:input>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:input>
<wsdl:output>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:output>
<wsdl:fault
name="CloudControllerServiceInvalidPartitionException">
- <soap12:fault use="literal"
name="CloudControllerServiceInvalidPartitionException"/>
+ <soap12:fault use="literal"
name="CloudControllerServiceInvalidPartitionException"></soap12:fault>
</wsdl:fault>
<wsdl:fault
name="CloudControllerServiceInvalidCartridgeTypeException">
- <soap12:fault use="literal"
name="CloudControllerServiceInvalidCartridgeTypeException"/>
+ <soap12:fault use="literal"
name="CloudControllerServiceInvalidCartridgeTypeException"></soap12:fault>
+ </wsdl:fault>
+ </wsdl:operation>
++<<<<<<< HEAD
+ <wsdl:operation name="terminateInstance">
+ <soap12:operation soapAction="urn:terminateInstance"
style="document"></soap12:operation>
+ <wsdl:input>
+ <soap12:body use="literal"></soap12:body>
+ </wsdl:input>
+ <wsdl:fault name="CloudControllerServiceInvalidMemberException">
+ <soap12:fault use="literal"
name="CloudControllerServiceInvalidMemberException"></soap12:fault>
+ </wsdl:fault>
+ <wsdl:fault
name="CloudControllerServiceInvalidCartridgeTypeException">
+ <soap12:fault use="literal"
name="CloudControllerServiceInvalidCartridgeTypeException"></soap12:fault>
</wsdl:fault>
</wsdl:operation>
++=======
++>>>>>>> master
<wsdl:operation name="registerService">
- <soap12:operation soapAction="urn:registerService"
style="document"/>
+ <soap12:operation soapAction="urn:registerService"
style="document"></soap12:operation>
<wsdl:input>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:input>
<wsdl:output>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:output>
<wsdl:fault
name="CloudControllerServiceUnregisteredCartridgeException">
- <soap12:fault use="literal"
name="CloudControllerServiceUnregisteredCartridgeException"/>
+ <soap12:fault use="literal"
name="CloudControllerServiceUnregisteredCartridgeException"></soap12:fault>
</wsdl:fault>
</wsdl:operation>
+ <wsdl:operation name="terminateInstance">
+ <soap12:operation soapAction="urn:terminateInstance"
style="document"/>
+ <wsdl:input>
+ <soap12:body use="literal"/>
+ </wsdl:input>
+ <wsdl:fault name="CloudControllerServiceInvalidMemberException">
+ <soap12:fault use="literal"
name="CloudControllerServiceInvalidMemberException"/>
+ </wsdl:fault>
+ <wsdl:fault
name="CloudControllerServiceInvalidCartridgeTypeException">
+ <soap12:fault use="literal"
name="CloudControllerServiceInvalidCartridgeTypeException"/>
+ </wsdl:fault>
+ </wsdl:operation>
<wsdl:operation name="deployCartridgeDefinition">
- <soap12:operation soapAction="urn:deployCartridgeDefinition"
style="document"/>
+ <soap12:operation soapAction="urn:deployCartridgeDefinition"
style="document"></soap12:operation>
<wsdl:input>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:input>
<wsdl:fault
name="CloudControllerServiceInvalidCartridgeDefinitionException">
- <soap12:fault use="literal"
name="CloudControllerServiceInvalidCartridgeDefinitionException"/>
+ <soap12:fault use="literal"
name="CloudControllerServiceInvalidCartridgeDefinitionException"></soap12:fault>
</wsdl:fault>
<wsdl:fault
name="CloudControllerServiceInvalidIaasProviderException">
- <soap12:fault use="literal"
name="CloudControllerServiceInvalidIaasProviderException"/>
+ <soap12:fault use="literal"
name="CloudControllerServiceInvalidIaasProviderException"></soap12:fault>
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="getCartridgeInfo">
@@@ -962,33 -839,33 +1212,42 @@@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="validateDeploymentPolicy">
- <http:operation location="validateDeploymentPolicy"/>
+ <http:operation
location="validateDeploymentPolicy"></http:operation>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml"
part="parameters"></mime:content>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml"
part="parameters"></mime:content>
</wsdl:output>
</wsdl:operation>
++<<<<<<< HEAD
+ <wsdl:operation name="terminateInstance">
+ <http:operation location="terminateInstance"></http:operation>
+ <wsdl:input>
+ <mime:content type="text/xml"
part="parameters"></mime:content>
+ </wsdl:input>
+ </wsdl:operation>
++=======
++>>>>>>> master
<wsdl:operation name="registerService">
- <http:operation location="registerService"/>
+ <http:operation location="registerService"></http:operation>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml"
part="parameters"></mime:content>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml"
part="parameters"></mime:content>
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="terminateInstance">
+ <http:operation location="terminateInstance"/>
+ <wsdl:input>
+ <mime:content type="text/xml" part="parameters"/>
+ </wsdl:input>
+ </wsdl:operation>
<wsdl:operation name="deployCartridgeDefinition">
- <http:operation location="deployCartridgeDefinition"/>
+ <http:operation
location="deployCartridgeDefinition"></http:operation>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml"
part="parameters"></mime:content>
</wsdl:input>
</wsdl:operation>
<wsdl:operation name="getCartridgeInfo">
@@@ -1060,22 -925,22 +1319,41 @@@
</wsdl:binding>
<wsdl:service name="CloudControllerService">
<wsdl:port name="CloudControllerServiceHttpSoap11Endpoint"
binding="ns:CloudControllerServiceSoap11Binding">
++<<<<<<< HEAD
+ <soap:address
location="http://172.16.2.207:9763/services/CloudControllerService.CloudControllerServiceHttpSoap11Endpoint/";></soap:address>
+ </wsdl:port>
+ <wsdl:port name="CloudControllerServiceHttpsSoap11Endpoint"
binding="ns:CloudControllerServiceSoap11Binding">
+ <soap:address
location="https://172.16.2.207:9443/services/CloudControllerService.CloudControllerServiceHttpsSoap11Endpoint/";></soap:address>
+ </wsdl:port>
+ <wsdl:port name="CloudControllerServiceHttpSoap12Endpoint"
binding="ns:CloudControllerServiceSoap12Binding">
+ <soap12:address
location="http://172.16.2.207:9763/services/CloudControllerService.CloudControllerServiceHttpSoap12Endpoint/";></soap12:address>
+ </wsdl:port>
+ <wsdl:port name="CloudControllerServiceHttpsSoap12Endpoint"
binding="ns:CloudControllerServiceSoap12Binding">
+ <soap12:address
location="https://172.16.2.207:9443/services/CloudControllerService.CloudControllerServiceHttpsSoap12Endpoint/";></soap12:address>
+ </wsdl:port>
+ <wsdl:port name="CloudControllerServiceHttpEndpoint"
binding="ns:CloudControllerServiceHttpBinding">
+ <http:address
location="http://172.16.2.207:9763/services/CloudControllerService.CloudControllerServiceHttpEndpoint/";></http:address>
+ </wsdl:port>
+ <wsdl:port name="CloudControllerServiceHttpsEndpoint"
binding="ns:CloudControllerServiceHttpBinding">
+ <http:address
location="https://172.16.2.207:9443/services/CloudControllerService.CloudControllerServiceHttpsEndpoint/";></http:address>
++=======
+ <soap:address
location="http://192.168.122.1:9763/services/CloudControllerService.CloudControllerServiceHttpSoap11Endpoint/"/>
+ </wsdl:port>
+ <wsdl:port name="CloudControllerServiceHttpsSoap11Endpoint"
binding="ns:CloudControllerServiceSoap11Binding">
+ <soap:address
location="https://192.168.122.1:9443/services/CloudControllerService.CloudControllerServiceHttpsSoap11Endpoint/"/>
+ </wsdl:port>
+ <wsdl:port name="CloudControllerServiceHttpSoap12Endpoint"
binding="ns:CloudControllerServiceSoap12Binding">
+ <soap12:address
location="http://192.168.122.1:9763/services/CloudControllerService.CloudControllerServiceHttpSoap12Endpoint/"/>
+ </wsdl:port>
+ <wsdl:port name="CloudControllerServiceHttpsSoap12Endpoint"
binding="ns:CloudControllerServiceSoap12Binding">
+ <soap12:address
location="https://192.168.122.1:9443/services/CloudControllerService.CloudControllerServiceHttpsSoap12Endpoint/"/>
+ </wsdl:port>
+ <wsdl:port name="CloudControllerServiceHttpEndpoint"
binding="ns:CloudControllerServiceHttpBinding">
+ <http:address
location="http://192.168.122.1:9763/services/CloudControllerService.CloudControllerServiceHttpEndpoint/"/>
+ </wsdl:port>
+ <wsdl:port name="CloudControllerServiceHttpsEndpoint"
binding="ns:CloudControllerServiceHttpBinding">
+ <http:address
location="https://192.168.122.1:9443/services/CloudControllerService.CloudControllerServiceHttpsEndpoint/"/>
++>>>>>>> master
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
