Repository: stratos Updated Branches: refs/heads/4.0.0-grouping fcf767661 -> 718445a8a
Revert "Dynamic and Static ServiceGroup properties" This reverts commit fcf76766182a6c72343fe873fdd76e3edad91909. Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/718445a8 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/718445a8 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/718445a8 Branch: refs/heads/4.0.0-grouping Commit: 718445a8a7ea0449c7ae03b0704649f1aab02a3b Parents: fcf7676 Author: Isuru Haththotuwa <[email protected]> Authored: Wed Sep 24 11:14:50 2014 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Wed Sep 24 11:14:50 2014 +0530 ---------------------------------------------------------------------- .../impl/CloudControllerServiceImpl.java | 22 +- .../interfaces/CloudControllerService.java | 4 - .../cloud/controller/pojo/ServiceGroup.java | 20 -- .../definitions/ServiceGroupDefinition.java | 20 -- .../grouping/definitions/StaticProperty.java | 54 ---- .../deployer/DefaultServiceGroupDeployer.java | 31 --- .../main/resources/CloudControllerService.wsdl | 248 +++++-------------- 7 files changed, 68 insertions(+), 331 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/718445a8/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java index 1a7df3e..6f72e63 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java @@ -56,7 +56,7 @@ import org.jclouds.rest.ResourceNotFoundException; import org.wso2.carbon.registry.core.exceptions.RegistryException; import java.util.*; -//import ; +import java.util.Properties; import java.util.concurrent.Callable; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Future; @@ -391,22 +391,6 @@ public class CloudControllerServiceImpl implements CloudControllerService { } return serviceGroup.getDependencies(); } - - public String [] getServiceGroupDynamicProperties (String name) throws InvalidServiceGroupException { - ServiceGroup serviceGroup = this.getServiceGroup(name); - if (serviceGroup == null) { - throw new InvalidServiceGroupException("Invalid ServiceGroup " + serviceGroup); - } - return serviceGroup.getDynamicProperties(); - } - - public org.apache.stratos.cloud.controller.pojo.Property [] getServiceGroupStaticProperties (String name) throws InvalidServiceGroupException { - ServiceGroup serviceGroup = this.getServiceGroup(name); - if (serviceGroup == null) { - throw new InvalidServiceGroupException("Invalid ServiceGroup " + serviceGroup); - } - return serviceGroup.getStaticProperties(); - } @Override public MemberContext startInstance(MemberContext memberContext) throws @@ -1087,7 +1071,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { throw new UnregisteredCartridgeException(msg); } - java.util.Properties props = CloudControllerUtil.toJavaUtilProperties(registrant.getProperties()); + Properties props = CloudControllerUtil.toJavaUtilProperties(registrant.getProperties()); String property = props.getProperty(Constants.IS_LOAD_BALANCER); boolean isLb = property != null ? Boolean.parseBoolean(property) : false; @@ -1107,7 +1091,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { private ClusterContext buildClusterContext(Cartridge cartridge, String clusterId, String payload, String hostName, - java.util.Properties props, boolean isLb, Persistence persistence) { + Properties props, boolean isLb, Persistence persistence) { // initialize ClusterContext http://git-wip-us.apache.org/repos/asf/stratos/blob/718445a8/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java index be3db2d..5301b14 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java @@ -58,10 +58,6 @@ public interface CloudControllerService { public String [] getServiceGroupCartridges (String name) throws InvalidServiceGroupException; public Dependencies getServiceGroupDependencies (String name) throws InvalidServiceGroupException; - - public String [] getServiceGroupDynamicProperties (String name) throws InvalidServiceGroupException; - - public org.apache.stratos.cloud.controller.pojo.Property [] getServiceGroupStaticProperties (String name) throws InvalidServiceGroupException; /** * Validate a given {@link Partition} for basic property existence. http://git-wip-us.apache.org/repos/asf/stratos/blob/718445a8/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ServiceGroup.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ServiceGroup.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ServiceGroup.java index b630937..45957f5 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ServiceGroup.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ServiceGroup.java @@ -34,10 +34,6 @@ public class ServiceGroup implements Serializable { private String [] cartridges; private Dependencies dependencies; - - private String [] dynamicProperties; - - private Property [] staticProperties; public String getName() { return name; @@ -70,20 +66,4 @@ public class ServiceGroup implements Serializable { public void setDependencies(Dependencies dependencies) { this.dependencies = dependencies; } - - public String[] getDynamicProperties() { - return dynamicProperties; - } - - public void setDynamicProperties(String[] dynamicProperties) { - this.dynamicProperties = dynamicProperties; - } - - public Property[] getStaticProperties() { - return staticProperties; - } - - public void setStaticProperties(Property[] staticProperties) { - this.staticProperties = staticProperties; - } } http://git-wip-us.apache.org/repos/asf/stratos/blob/718445a8/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/definitions/ServiceGroupDefinition.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/definitions/ServiceGroupDefinition.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/definitions/ServiceGroupDefinition.java index 3ff1e01..ac8321f 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/definitions/ServiceGroupDefinition.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/definitions/ServiceGroupDefinition.java @@ -31,10 +31,6 @@ public class ServiceGroupDefinition implements Serializable { private List<String> subGroups; private List<String> cartridges; - - private List<String> dynamicProperties; - - private List<StaticProperty> staticProperties; private DependencyDefinitions dependencies; @@ -69,20 +65,4 @@ public class ServiceGroupDefinition implements Serializable { public void setDependencies(DependencyDefinitions dependencies) { this.dependencies = dependencies; } - - public List<String> getDynamicProperties() { - return dynamicProperties; - } - - public void setDynamicProperties(List<String> dynamicProperties) { - this.dynamicProperties = dynamicProperties; - } - - public List<StaticProperty> getStaticProperties() { - return staticProperties; - } - - public void setStaticProperties(List<StaticProperty> staticProperties) { - this.staticProperties = staticProperties; - } } http://git-wip-us.apache.org/repos/asf/stratos/blob/718445a8/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/definitions/StaticProperty.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/definitions/StaticProperty.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/definitions/StaticProperty.java deleted file mode 100644 index 3dbce8e..0000000 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/definitions/StaticProperty.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.stratos.manager.grouping.definitions; - -import javax.xml.bind.annotation.XmlRootElement; -import java.io.Serializable; - -@XmlRootElement(name = "staticProperty") -public class StaticProperty implements Serializable { - - /** - * - */ - private static final long serialVersionUID = -3404671418913923858L; - - private String name; - - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - - -} http://git-wip-us.apache.org/repos/asf/stratos/blob/718445a8/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java index b352e95..f944288 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java @@ -26,7 +26,6 @@ import org.apache.stratos.manager.client.CloudControllerServiceClient; import org.apache.stratos.manager.exception.ADCException; import org.apache.stratos.manager.exception.InvalidServiceGroupException; import org.apache.stratos.manager.exception.ServiceGroupDefinitioException; -import org.apache.stratos.manager.grouping.definitions.StaticProperty; import org.apache.stratos.manager.grouping.definitions.ServiceGroupDefinition; import org.apache.stratos.manager.grouping.definitions.DependencyDefinitions; import org.apache.stratos.manager.grouping.definitions.StartupOrderDefinition; @@ -242,8 +241,6 @@ public class DefaultServiceGroupDeployer implements ServiceGroupDeployer { servicegroup.setName(serviceGroupDefinition.getName()); List<String> subGroupsDef = serviceGroupDefinition.getSubGroups(); List<String> cartridgesDef = serviceGroupDefinition.getCartridges(); - List<String> dynamicPropertiesDef = serviceGroupDefinition.getDynamicProperties(); - List<StaticProperty> staticPropertiesDef = serviceGroupDefinition.getStaticProperties(); if (subGroupsDef == null) { subGroupsDef = new ArrayList<String>(0); @@ -255,15 +252,12 @@ public class DefaultServiceGroupDeployer implements ServiceGroupDeployer { String [] subGroups = new String[subGroupsDef.size()]; String [] cartridges = new String[cartridgesDef.size()]; - String [] dynamicProperties = new String[dynamicPropertiesDef.size()]; subGroups = subGroupsDef.toArray(subGroups); cartridges = cartridgesDef.toArray(cartridges); - dynamicProperties = dynamicPropertiesDef.toArray(dynamicProperties); servicegroup.setSubGroups(subGroups); servicegroup.setCartridges(cartridges); - servicegroup.setDynamicProperties(dynamicProperties); DependencyDefinitions depDefs = serviceGroupDefinition.getDependencies(); if (depDefs != null) { @@ -284,20 +278,6 @@ public class DefaultServiceGroupDeployer implements ServiceGroupDeployer { deps.setKillBehaviour(depDefs.getKillBehaviour()); servicegroup.setDependencies(deps); } - - List<StaticProperty> propDefs = serviceGroupDefinition.getStaticProperties(); - org.apache.stratos.cloud.controller.stub.pojo.Property[] props = - new org.apache.stratos.cloud.controller.stub.pojo.Property [propDefs.size()]; - - int i = 0; - for (StaticProperty propDef : propDefs) { - org.apache.stratos.cloud.controller.stub.pojo.Property prop = - new org.apache.stratos.cloud.controller.stub.pojo.Property(); - prop.setName(propDef.getName()); - prop.setValue(propDef.getValue()); - props[i] = prop; - } - servicegroup.setStaticProperties(props); return servicegroup; } @@ -308,7 +288,6 @@ public class DefaultServiceGroupDeployer implements ServiceGroupDeployer { String [] cartridges = serviceGroup.getCartridges(); String [] subGroups = serviceGroup.getSubGroups(); Dependencies deps = serviceGroup.getDependencies(); - org.apache.stratos.cloud.controller.stub.pojo.Property [] props = serviceGroup.getStaticProperties(); if (deps != null) { DependencyDefinitions depsDef = new DependencyDefinitions(); @@ -330,16 +309,6 @@ public class DefaultServiceGroupDeployer implements ServiceGroupDeployer { depsDef.setKillBehaviour(deps.getKillBehaviour()); servicegroupDef.setDependencies(depsDef); } - - if (props != null) { - List<StaticProperty> propDefs = new ArrayList<StaticProperty>(); - for (org.apache.stratos.cloud.controller.stub.pojo.Property prop : props) { - StaticProperty propDef = new StaticProperty(); - propDef.setName(prop.getName()); - propDef.setValue(prop.getValue()); - } - servicegroupDef.setStaticProperties(propDefs); - } List<String> cartridgesDef = new ArrayList<String>(Arrays.asList(cartridges)); List<String> subGroupsDef = new ArrayList<String>(Arrays.asList(subGroups)); http://git-wip-us.apache.org/repos/asf/stratos/blob/718445a8/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl ---------------------------------------------------------------------- diff --git a/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl b/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl index de633d1..876fcd8 100644 --- a/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl +++ b/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl @@ -1,4 +1,4 @@ -<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; xmlns:ax220="http://pojo.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://application.pojo.controller.cloud.stratos.apache.org/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:ax224="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"; 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";> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; xmlns:ax220="http://application.pojo.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://pojo.controller.cloud.stratos.apache.org/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:ax224="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"; 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";> <wsdl:documentation>CloudControllerService</wsdl:documentation> <wsdl:types> <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://application.pojo.controller.cloud.stratos.apache.org/xsd";> @@ -6,8 +6,8 @@ <xs:sequence> <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="components" nillable="true" type="ax222:ComponentContext"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax222:SubscribableInfoContext"></xs:element> + <xs:element minOccurs="0" name="components" nillable="true" type="ax220:ComponentContext"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax220:SubscribableInfoContext"></xs:element> <xs:element minOccurs="0" name="teantAdminUsername" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="tenantDomain" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="tenantId" type="xs:int"></xs:element> @@ -15,15 +15,15 @@ </xs:complexType> <xs:complexType name="ComponentContext"> <xs:sequence> - <xs:element minOccurs="0" name="dependencyContext" nillable="true" type="ax222:DependencyContext"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax222:GroupContext"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribableContexts" nillable="true" type="ax222:SubscribableContext"></xs:element> + <xs:element minOccurs="0" name="dependencyContext" nillable="true" type="ax220:DependencyContext"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax220:GroupContext"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribableContexts" nillable="true" type="ax220:SubscribableContext"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="DependencyContext"> <xs:sequence> <xs:element minOccurs="0" name="killBehaviour" nillable="true" type="xs:string"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="startupOrderContext" nillable="true" type="ax222:StartupOrderContext"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="startupOrderContext" nillable="true" type="ax220:StartupOrderContext"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="StartupOrderContext"> @@ -37,9 +37,9 @@ <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="autoscalingPolicy" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="xs:string"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax222:GroupContext"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax220:GroupContext"></xs:element> <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribableContexts" nillable="true" type="ax222:SubscribableContext"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribableContexts" nillable="true" type="ax220:SubscribableContext"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="SubscribableContext"> @@ -117,10 +117,10 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax219="http://exception.controller.cloud.stratos.apache.org/xsd"; xmlns:ax221="http://pojo.controller.cloud.stratos.apache.org/xsd"; xmlns:ax223="http://application.pojo.controller.cloud.stratos.apache.org/xsd"; xmlns:ax226="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.controller.cloud.stratos.apache.org";> + <xs:schema xmlns:ax219="http://exception.controller.cloud.stratos.apache.org/xsd"; xmlns:ax221="http://application.pojo.controller.cloud.stratos.apache.org/xsd"; xmlns:ax223="http://pojo.controller.cloud.stratos.apache.org/xsd"; xmlns:ax226="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://exception.controller.cloud.stratos.apache.org/xsd";></xs:import> - <xs:import namespace="http://pojo.controller.cloud.stratos.apache.org/xsd";></xs:import> <xs:import namespace="http://application.pojo.controller.cloud.stratos.apache.org/xsd";></xs:import> + <xs:import namespace="http://pojo.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="CloudControllerServiceApplicationDefinitionException"> <xs:complexType> @@ -129,6 +129,13 @@ </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="deployApplicationDefinition"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax220:ApplicationContext"></xs:element> + </xs:sequence> + </xs:complexType> + </xs:element> <xs:element name="unDeployApplicationDefinition"> <xs:complexType> <xs:sequence> @@ -155,14 +162,7 @@ <xs:element name="deployCartridgeDefinition"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="cartridgeConfig" nillable="true" type="ax220:CartridgeConfig"></xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="deployApplicationDefinition"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax222:ApplicationContext"></xs:element> + <xs:element minOccurs="0" name="cartridgeConfig" nillable="true" type="ax222:CartridgeConfig"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -176,7 +176,7 @@ <xs:element name="getClusterContextResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax220:ClusterContext"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax222:ClusterContext"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -190,7 +190,7 @@ <xs:element name="deployCompositeApplicationDefinition"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="compositeApplicationDefinition" nillable="true" type="ax220:CompositeApplicationDefinition"></xs:element> + <xs:element minOccurs="0" name="compositeApplicationDefinition" nillable="true" type="ax222:CompositeApplicationDefinition"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -211,7 +211,7 @@ <xs:element name="getCartridgeInfoResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax220:CartridgeInfo"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax222:CartridgeInfo"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -268,7 +268,7 @@ <xs:element name="deployServiceGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax220:ServiceGroup"></xs:element> + <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax222:ServiceGroup"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -317,49 +317,21 @@ <xs:element name="getServiceGroupDependenciesResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax220:Dependencies"></xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="getServiceGroupDynamicProperties"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="getServiceGroupDynamicPropertiesResponse"> - <xs:complexType> - <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"></xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="getServiceGroupStaticProperties"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="getServiceGroupStaticPropertiesResponse"> - <xs:complexType> - <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax220:Property"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax222:Dependencies"></xs:element> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="startInstance"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="memberContext" nillable="true" type="ax220:MemberContext"></xs:element> + <xs:element minOccurs="0" name="memberContext" nillable="true" type="ax222:MemberContext"></xs:element> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="startInstanceResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax220:MemberContext"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax222:MemberContext"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -417,38 +389,38 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceUnregisteredClusterException"> + <xs:element name="getServiceGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="UnregisteredClusterException" nillable="true" type="ax219:UnregisteredClusterException"></xs:element> + <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="unregisterService"> + <xs:element name="getServiceGroupResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax222:ServiceGroup"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroup"> + <xs:element name="CloudControllerServiceUnregisteredClusterException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="UnregisteredClusterException" nillable="true" type="ax219:UnregisteredClusterException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroupResponse"> + <xs:element name="unregisterService"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax220:ServiceGroup"></xs:element> + <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="registerService"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="registrant" nillable="true" type="ax220:Registrant"></xs:element> + <xs:element minOccurs="0" name="registrant" nillable="true" type="ax222:Registrant"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -467,7 +439,7 @@ <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="ax220:Properties"></xs:element> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax222:Properties"></xs:element> <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> @@ -483,12 +455,12 @@ <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="ax220:IaasConfig"></xs:element> - <xs:element minOccurs="0" name="lbConfig" nillable="true" type="ax220:LoadbalancerConfig"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="iaasConfigs" nillable="true" type="ax222:IaasConfig"></xs:element> + <xs:element minOccurs="0" name="lbConfig" nillable="true" type="ax222:LoadbalancerConfig"></xs:element> <xs:element minOccurs="0" name="multiTenant" type="xs:boolean"></xs:element> - <xs:element minOccurs="0" name="persistence" nillable="true" type="ax220:Persistence"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax220:PortMapping"></xs:element> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax220:Properties"></xs:element> + <xs:element minOccurs="0" name="persistence" nillable="true" type="ax222:Persistence"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax222:PortMapping"></xs:element> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax222: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> @@ -503,16 +475,16 @@ <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="ax220:NetworkInterfaces"></xs:element> + <xs:element minOccurs="0" name="networkInterfaces" nillable="true" type="ax222: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="ax220:Properties"></xs:element> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax222: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="ax220:NetworkInterface"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="networkInterfaces" nillable="true" type="ax222:NetworkInterface"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="NetworkInterface"> @@ -524,7 +496,7 @@ </xs:complexType> <xs:complexType name="Properties"> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax220:Property"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax222:Property"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="Property"> @@ -535,14 +507,14 @@ </xs:complexType> <xs:complexType name="LoadbalancerConfig"> <xs:sequence> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax220:Properties"></xs:element> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax222:Properties"></xs:element> <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> <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="ax220:Volume"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax222:Volume"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="Volume"> @@ -573,15 +545,15 @@ <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="ax220:Volume"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax222:Volume"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="CompositeApplicationDefinition"> <xs:sequence> <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridges" nillable="true" type="ax220:ConfigCartridge"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="components" nillable="true" type="ax220:ConfigGroup"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridges" nillable="true" type="ax222:ConfigCartridge"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="components" nillable="true" type="ax222:ConfigGroup"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="ConfigCartridge"> @@ -592,14 +564,14 @@ <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="ax220:ConfigDependencies"></xs:element> + <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax222:ConfigDependencies"></xs:element> <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribables" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> <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="ax220:ConfigDependencyPair"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="startup_order" nillable="true" type="ax222:ConfigDependencyPair"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="ConfigDependencyPair"> @@ -610,7 +582,7 @@ </xs:complexType> <xs:complexType name="CartridgeInfo"> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="appTypes" nillable="true" type="ax220:AppType"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="appTypes" nillable="true" type="ax222: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> @@ -618,11 +590,11 @@ <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="ax220:LoadbalancerConfig"></xs:element> + <xs:element minOccurs="0" name="lbConfig" nillable="true" type="ax222:LoadbalancerConfig"></xs:element> <xs:element minOccurs="0" name="multiTenant" type="xs:boolean"></xs:element> - <xs:element minOccurs="0" name="persistence" nillable="true" type="ax220:Persistence"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax220:PortMapping"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax220:Property"></xs:element> + <xs:element minOccurs="0" name="persistence" nillable="true" type="ax222:Persistence"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax222:PortMapping"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax222:Property"></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> @@ -638,17 +610,15 @@ <xs:complexType name="ServiceGroup"> <xs:sequence> <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridges" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax220:Dependencies"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="dynamicProperties" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax222:Dependencies"></xs:element> <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="staticProperties" nillable="true" type="ax220:Property"></xs:element> <xs:element maxOccurs="unbounded" minOccurs="0" name="subGroups" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="Dependencies"> <xs:sequence> <xs:element minOccurs="0" name="killBehaviour" nillable="true" type="xs:string"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="startupOrder" nillable="true" type="ax220:StartupOrder"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="startupOrder" nillable="true" type="ax222:StartupOrder"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="StartupOrder"> @@ -670,7 +640,7 @@ <xs:element minOccurs="0" name="nodeId" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="partition" nillable="true" type="ax224:Partition"></xs:element> <xs:element minOccurs="0" name="privateIpAddress" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax220:Properties"></xs:element> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax222:Properties"></xs:element> <xs:element minOccurs="0" name="publicIpAddress" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> @@ -682,8 +652,8 @@ <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="ax220:Persistence"></xs:element> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax220:Properties"></xs:element> + <xs:element minOccurs="0" name="persistence" nillable="true" type="ax222:Persistence"></xs:element> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax222:Properties"></xs:element> <xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> @@ -698,15 +668,6 @@ <wsdl:message name="CloudControllerServiceInvalidPartitionException"> <wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidPartitionException"></wsdl:part> </wsdl:message> - <wsdl:message name="getServiceGroupStaticPropertiesRequest"> - <wsdl:part name="parameters" element="ns:getServiceGroupStaticProperties"></wsdl:part> - </wsdl:message> - <wsdl:message name="getServiceGroupStaticPropertiesResponse"> - <wsdl:part name="parameters" element="ns:getServiceGroupStaticPropertiesResponse"></wsdl:part> - </wsdl:message> - <wsdl:message name="CloudControllerServiceInvalidServiceGroupException"> - <wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidServiceGroupException"></wsdl:part> - </wsdl:message> <wsdl:message name="validateDeploymentPolicyRequest"> <wsdl:part name="parameters" element="ns:validateDeploymentPolicy"></wsdl:part> </wsdl:message> @@ -722,6 +683,9 @@ <wsdl:message name="getServiceGroupCartridgesResponse"> <wsdl:part name="parameters" element="ns:getServiceGroupCartridgesResponse"></wsdl:part> </wsdl:message> + <wsdl:message name="CloudControllerServiceInvalidServiceGroupException"> + <wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidServiceGroupException"></wsdl:part> + </wsdl:message> <wsdl:message name="terminateInstanceRequest"> <wsdl:part name="parameters" element="ns:terminateInstance"></wsdl:part> </wsdl:message> @@ -779,12 +743,6 @@ <wsdl:message name="getCartridgeInfoResponse"> <wsdl:part name="parameters" element="ns:getCartridgeInfoResponse"></wsdl:part> </wsdl:message> - <wsdl:message name="getServiceGroupDynamicPropertiesRequest"> - <wsdl:part name="parameters" element="ns:getServiceGroupDynamicProperties"></wsdl:part> - </wsdl:message> - <wsdl:message name="getServiceGroupDynamicPropertiesResponse"> - <wsdl:part name="parameters" element="ns:getServiceGroupDynamicPropertiesResponse"></wsdl:part> - </wsdl:message> <wsdl:message name="deployApplicationDefinitionRequest"> <wsdl:part name="parameters" element="ns:deployApplicationDefinition"></wsdl:part> </wsdl:message> @@ -839,11 +797,6 @@ <wsdl:output message="ns:validatePartitionResponse" wsaw:Action="urn:validatePartitionResponse"></wsdl:output> <wsdl:fault message="ns:CloudControllerServiceInvalidPartitionException" name="CloudControllerServiceInvalidPartitionException" wsaw:Action="urn:validatePartitionCloudControllerServiceInvalidPartitionException"></wsdl:fault> </wsdl:operation> - <wsdl:operation name="getServiceGroupStaticProperties"> - <wsdl:input message="ns:getServiceGroupStaticPropertiesRequest" wsaw:Action="urn:getServiceGroupStaticProperties"></wsdl:input> - <wsdl:output message="ns:getServiceGroupStaticPropertiesResponse" wsaw:Action="urn:getServiceGroupStaticPropertiesResponse"></wsdl:output> - <wsdl:fault message="ns:CloudControllerServiceInvalidServiceGroupException" name="CloudControllerServiceInvalidServiceGroupException" wsaw:Action="urn:getServiceGroupStaticPropertiesCloudControllerServiceInvalidServiceGroupException"></wsdl:fault> - </wsdl:operation> <wsdl:operation name="validateDeploymentPolicy"> <wsdl:input message="ns:validateDeploymentPolicyRequest" wsaw:Action="urn:validateDeploymentPolicy"></wsdl:input> <wsdl:output message="ns:validateDeploymentPolicyResponse" wsaw:Action="urn:validateDeploymentPolicyResponse"></wsdl:output> @@ -898,11 +851,6 @@ <wsdl:output message="ns:getCartridgeInfoResponse" wsaw:Action="urn:getCartridgeInfoResponse"></wsdl:output> <wsdl:fault message="ns:CloudControllerServiceUnregisteredCartridgeException" name="CloudControllerServiceUnregisteredCartridgeException" wsaw:Action="urn:getCartridgeInfoCloudControllerServiceUnregisteredCartridgeException"></wsdl:fault> </wsdl:operation> - <wsdl:operation name="getServiceGroupDynamicProperties"> - <wsdl:input message="ns:getServiceGroupDynamicPropertiesRequest" wsaw:Action="urn:getServiceGroupDynamicProperties"></wsdl:input> - <wsdl:output message="ns:getServiceGroupDynamicPropertiesResponse" wsaw:Action="urn:getServiceGroupDynamicPropertiesResponse"></wsdl:output> - <wsdl:fault message="ns:CloudControllerServiceInvalidServiceGroupException" name="CloudControllerServiceInvalidServiceGroupException" wsaw:Action="urn:getServiceGroupDynamicPropertiesCloudControllerServiceInvalidServiceGroupException"></wsdl:fault> - </wsdl:operation> <wsdl:operation name="deployApplicationDefinition"> <wsdl:input message="ns:deployApplicationDefinitionRequest" wsaw:Action="urn:deployApplicationDefinition"></wsdl:input> <wsdl:fault message="ns:CloudControllerServiceApplicationDefinitionException" name="CloudControllerServiceApplicationDefinitionException" wsaw:Action="urn:deployApplicationDefinitionCloudControllerServiceApplicationDefinitionException"></wsdl:fault> @@ -962,18 +910,6 @@ <soap:fault use="literal" name="CloudControllerServiceInvalidPartitionException"></soap:fault> </wsdl:fault> </wsdl:operation> - <wsdl:operation name="getServiceGroupStaticProperties"> - <soap:operation soapAction="urn:getServiceGroupStaticProperties" style="document"></soap:operation> - <wsdl:input> - <soap:body use="literal"></soap:body> - </wsdl:input> - <wsdl:output> - <soap:body use="literal"></soap:body> - </wsdl:output> - <wsdl:fault name="CloudControllerServiceInvalidServiceGroupException"> - <soap:fault use="literal" name="CloudControllerServiceInvalidServiceGroupException"></soap:fault> - </wsdl:fault> - </wsdl:operation> <wsdl:operation name="validateDeploymentPolicy"> <soap:operation soapAction="urn:validateDeploymentPolicy" style="document"></soap:operation> <wsdl:input> @@ -1112,18 +1048,6 @@ <soap:fault use="literal" name="CloudControllerServiceApplicationDefinitionException"></soap:fault> </wsdl:fault> </wsdl:operation> - <wsdl:operation name="getServiceGroupDynamicProperties"> - <soap:operation soapAction="urn:getServiceGroupDynamicProperties" style="document"></soap:operation> - <wsdl:input> - <soap:body use="literal"></soap:body> - </wsdl:input> - <wsdl:output> - <soap:body use="literal"></soap:body> - </wsdl:output> - <wsdl:fault name="CloudControllerServiceInvalidServiceGroupException"> - <soap:fault use="literal" name="CloudControllerServiceInvalidServiceGroupException"></soap:fault> - </wsdl:fault> - </wsdl:operation> <wsdl:operation name="unregisterService"> <soap:operation soapAction="urn:unregisterService" style="document"></soap:operation> <wsdl:input> @@ -1232,18 +1156,6 @@ <soap12:fault use="literal" name="CloudControllerServiceInvalidPartitionException"></soap12:fault> </wsdl:fault> </wsdl:operation> - <wsdl:operation name="getServiceGroupStaticProperties"> - <soap12:operation soapAction="urn:getServiceGroupStaticProperties" style="document"></soap12:operation> - <wsdl:input> - <soap12:body use="literal"></soap12:body> - </wsdl:input> - <wsdl:output> - <soap12:body use="literal"></soap12:body> - </wsdl:output> - <wsdl:fault name="CloudControllerServiceInvalidServiceGroupException"> - <soap12:fault use="literal" name="CloudControllerServiceInvalidServiceGroupException"></soap12:fault> - </wsdl:fault> - </wsdl:operation> <wsdl:operation name="validateDeploymentPolicy"> <soap12:operation soapAction="urn:validateDeploymentPolicy" style="document"></soap12:operation> <wsdl:input> @@ -1382,18 +1294,6 @@ <soap12:fault use="literal" name="CloudControllerServiceApplicationDefinitionException"></soap12:fault> </wsdl:fault> </wsdl:operation> - <wsdl:operation name="getServiceGroupDynamicProperties"> - <soap12:operation soapAction="urn:getServiceGroupDynamicProperties" style="document"></soap12:operation> - <wsdl:input> - <soap12:body use="literal"></soap12:body> - </wsdl:input> - <wsdl:output> - <soap12:body use="literal"></soap12:body> - </wsdl:output> - <wsdl:fault name="CloudControllerServiceInvalidServiceGroupException"> - <soap12:fault use="literal" name="CloudControllerServiceInvalidServiceGroupException"></soap12:fault> - </wsdl:fault> - </wsdl:operation> <wsdl:operation name="unregisterService"> <soap12:operation soapAction="urn:unregisterService" style="document"></soap12:operation> <wsdl:input> @@ -1499,15 +1399,6 @@ <mime:content type="text/xml" part="parameters"></mime:content> </wsdl:output> </wsdl:operation> - <wsdl:operation name="getServiceGroupStaticProperties"> - <http:operation location="getServiceGroupStaticProperties"></http:operation> - <wsdl:input> - <mime:content type="text/xml" part="parameters"></mime:content> - </wsdl:input> - <wsdl:output> - <mime:content type="text/xml" part="parameters"></mime:content> - </wsdl:output> - </wsdl:operation> <wsdl:operation name="validateDeploymentPolicy"> <http:operation location="validateDeploymentPolicy"></http:operation> <wsdl:input> @@ -1601,15 +1492,6 @@ <mime:content type="text/xml" part="parameters"></mime:content> </wsdl:input> </wsdl:operation> - <wsdl:operation name="getServiceGroupDynamicProperties"> - <http:operation location="getServiceGroupDynamicProperties"></http:operation> - <wsdl:input> - <mime:content type="text/xml" part="parameters"></mime:content> - </wsdl:input> - <wsdl:output> - <mime:content type="text/xml" part="parameters"></mime:content> - </wsdl:output> - </wsdl:operation> <wsdl:operation name="unregisterService"> <http:operation location="unregisterService"></http:operation> <wsdl:input>
