changes to WSDL with latest CC changes and change POM to map namespaces correctly to CC packages
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/f942c242 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f942c242 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f942c242 Branch: refs/heads/master Commit: f942c24257e2bdc30bc8a9f9b291d8cdc56eb58c Parents: 25555e8 Author: Nirmal Fernando <[email protected]> Authored: Thu Nov 28 21:28:49 2013 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Thu Nov 28 21:28:49 2013 +0530 ---------------------------------------------------------------------- .../pom.xml | 13 +- .../main/resources/CloudControllerService.wsdl | 122 ++++++++++--------- 2 files changed, 70 insertions(+), 65 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f942c242/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml ---------------------------------------------------------------------- diff --git a/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml b/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml index 985e3ab..dc6fae7 100644 --- a/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml +++ b/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml @@ -47,7 +47,7 @@ <configuration> <tasks> <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true"> - <arg line="-uri src/main/resources/CloudControllerService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.cloud.controller.stub"/> + <arg line="-uri src/main/resources/CloudControllerService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.cloud.controller.stub -ns2p http://policy.deployment.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.deployment.policy,http://partition.deployment.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.deployment.partition,http://exception.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.exception,http://pojo.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.pojo"/> <classpath refid="maven.dependency.classpath"/> <classpath refid="maven.compile.classpath"/> <classpath refid="maven.runtime.classpath"/> @@ -87,12 +87,11 @@ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-Name>${project.artifactId}</Bundle-Name> <Export-Package> - org.apache.stratos.cloud.controller.exception.xsd.*; version=${project.version}, - org.apache.stratos.cloud.controller.stub.*; version=${project.version}, - org.apache.stratos.cloud.controller.pojo.xsd.*; version=${project.version}, - org.apache.stratos.cloud.controller.util.xsd.*; version=${project.version}, - org.apache.stratos.messaging.domain.policy.xsd.*; version=${project.version}, - org.apache.stratos.messaging.util.xsd.*; version=${project.version} + org.apache.stratos.cloud.controller.exception.*; version=${project.version}, + org.apache.stratos.cloud.controller.deployment.policy.*; version=${project.version}, + org.apache.stratos.cloud.controller.deployment.partition.*; version=${project.version}, + org.apache.stratos.cloud.controller.pojo.*; version=${project.version}, + org.apache.stratos.cloud.controller.stub.*; version=${project.version} </Export-Package> <Import-Package> *;resolution:=optional http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f942c242/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 6726178..61e2f5e 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,26 +1,6 @@ -<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; xmlns:ax29="http://pojo.controller.cloud.stratos.apache.org/xsd"; xmlns:ns="http://impl.controller.cloud.stratos.apache.org"; xmlns:ax25="http://policy.domain.messaging.stratos.apache.org/xsd"; xmlns:ax26="http://util.messaging.stratos.apache.org/xsd"; xmlns:ax23="http://exception.controller.cloud.stratos.apache.org/xsd"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:ax212="http://util.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: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:ax29="http://policy.deployment.controller.cloud.stratos.apache.org/xsd"; xmlns:ns="http://impl.controller.cloud.stratos.apache.org"; xmlns:ax25="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"; xmlns:ax26="http://pojo.controller.cloud.stratos.apache.org/xsd"; xmlns:ax23="http://exception.controller.cloud.stratos.apache.org/xsd"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"; xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"; targetNamespace="http://impl.controller.cloud.stratos.apache.org";> <wsdl:documentation>CloudControllerService</wsdl:documentation> <wsdl:types> - <xs:schema xmlns:ax27="http://util.messaging.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://policy.domain.messaging.stratos.apache.org/xsd";> - <xs:import namespace="http://util.messaging.stratos.apache.org/xsd"/> - <xs:complexType name="Partition"> - <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="partitionMembersMax" type="xs:int"/> - <xs:element minOccurs="0" name="partitionMembersMin" type="xs:int"/> - <xs:element minOccurs="0" name="partitionMin" type="xs:int"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax27:Properties"/> - <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - <xs:complexType name="DeploymentPolicy"> - <xs:sequence> - <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="partitionGroups" nillable="true" type="xs:anyType"/> - </xs:sequence> - </xs:complexType> - </xs:schema> <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://exception.controller.cloud.stratos.apache.org/xsd";> <xs:complexType name="InvalidPartitionException"> <xs:sequence/> @@ -41,11 +21,11 @@ <xs:sequence/> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax214="http://util.controller.cloud.stratos.apache.org/xsd"; xmlns:ax28="http://policy.domain.messaging.stratos.apache.org/xsd"; xmlns:ax211="http://pojo.controller.cloud.stratos.apache.org/xsd"; xmlns:ax24="http://exception.controller.cloud.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.controller.cloud.stratos.apache.org";> + <xs:schema xmlns:ax212="http://pojo.controller.cloud.stratos.apache.org/xsd"; xmlns:ax28="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"; xmlns:ax211="http://policy.deployment.controller.cloud.stratos.apache.org/xsd"; xmlns:ax24="http://exception.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://policy.domain.messaging.stratos.apache.org/xsd"/> + <xs:import namespace="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"/> + <xs:import namespace="http://policy.deployment.controller.cloud.stratos.apache.org/xsd"/> <xs:import namespace="http://pojo.controller.cloud.stratos.apache.org/xsd"/> - <xs:import namespace="http://util.controller.cloud.stratos.apache.org/xsd"/> <xs:element name="CloudControllerServiceInvalidPartitionException"> <xs:complexType> <xs:sequence> @@ -78,7 +58,7 @@ <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax28:DeploymentPolicy"/> + <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax29:DeploymentPolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -163,7 +143,7 @@ <xs:element name="registerService"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="registrant" nillable="true" type="ax29:Registrant"/> + <xs:element minOccurs="0" name="registrant" nillable="true" type="ax212:Registrant"/> </xs:sequence> </xs:complexType> </xs:element> @@ -210,24 +190,56 @@ <xs:element name="getCartridgeInfoResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax214:CartridgeInfo"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax212:CartridgeInfo"/> </xs:sequence> </xs:complexType> </xs:element> </xs:schema> - <xs:schema xmlns:ax213="http://util.messaging.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://util.controller.cloud.stratos.apache.org/xsd";> - <xs:import namespace="http://util.messaging.stratos.apache.org/xsd"/> + <xs:schema xmlns:ax210="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://policy.deployment.controller.cloud.stratos.apache.org/xsd";> + <xs:import namespace="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"/> + <xs:complexType name="DeploymentPolicy"> + <xs:sequence> + <xs:element minOccurs="0" name="allPartitions" nillable="true" type="xs:anyType"/> + <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="partitionGroup" nillable="true" type="ax210:PartitionGroup"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="partitionGroups" nillable="true" type="ax210:PartitionGroup"/> + </xs:sequence> + </xs:complexType> + </xs:schema> + <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://pojo.controller.cloud.stratos.apache.org/xsd";> + <xs:complexType name="Properties"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax26:Property"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="Property"> + <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: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="hostName" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax26:Properties"/> + <xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> <xs:complexType name="CartridgeInfo"> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="appTypes" nillable="true" type="ax212:AppType"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="appTypes" nillable="true" type="ax26:AppType"/> <xs:element minOccurs="0" name="baseDir" 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="multiTenant" type="xs:boolean"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax212:PortMapping"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax213:Property"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax26:PortMapping"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax26:Property"/> <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="version" nillable="true" type="xs:string"/> @@ -247,30 +259,24 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax210="http://util.messaging.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://pojo.controller.cloud.stratos.apache.org/xsd";> - <xs:import namespace="http://util.messaging.stratos.apache.org/xsd"/> - <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="hostName" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax210:Properties"/> - <xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:schema> - <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://util.messaging.stratos.apache.org/xsd";> - <xs:complexType name="Properties"> + <xs:schema xmlns:ax27="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"> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax26:Property"/> + <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="partitionMembersMax" type="xs:int"/> + <xs:element minOccurs="0" name="partitionMembersMin" type="xs:int"/> + <xs:element minOccurs="0" name="partitionMin" type="xs:int"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax27:Properties"/> + <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> - <xs:complexType name="Property"> + <xs:complexType name="PartitionGroup"> <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="id" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="partitionAlgo" nillable="true" type="xs:string"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax25:Partition"/> </xs:sequence> </xs:complexType> </xs:schema> @@ -738,22 +744,22 @@ </wsdl:binding> <wsdl:service name="CloudControllerService"> <wsdl:port name="CloudControllerServiceHttpSoap11Endpoint" binding="ns:CloudControllerServiceSoap11Binding"> - <soap:address location="http://10.148.149.181:9764/services/CloudControllerService.CloudControllerServiceHttpSoap11Endpoint/"/> + <soap:address location="http://192.168.1.2:9764/services/CloudControllerService.CloudControllerServiceHttpSoap11Endpoint/"/> </wsdl:port> <wsdl:port name="CloudControllerServiceHttpsSoap11Endpoint" binding="ns:CloudControllerServiceSoap11Binding"> - <soap:address location="https://10.148.149.181:9444/services/CloudControllerService.CloudControllerServiceHttpsSoap11Endpoint/"/> + <soap:address location="https://192.168.1.2:9444/services/CloudControllerService.CloudControllerServiceHttpsSoap11Endpoint/"/> </wsdl:port> <wsdl:port name="CloudControllerServiceHttpSoap12Endpoint" binding="ns:CloudControllerServiceSoap12Binding"> - <soap12:address location="http://10.148.149.181:9764/services/CloudControllerService.CloudControllerServiceHttpSoap12Endpoint/"/> + <soap12:address location="http://192.168.1.2:9764/services/CloudControllerService.CloudControllerServiceHttpSoap12Endpoint/"/> </wsdl:port> <wsdl:port name="CloudControllerServiceHttpsSoap12Endpoint" binding="ns:CloudControllerServiceSoap12Binding"> - <soap12:address location="https://10.148.149.181:9444/services/CloudControllerService.CloudControllerServiceHttpsSoap12Endpoint/"/> + <soap12:address location="https://192.168.1.2:9444/services/CloudControllerService.CloudControllerServiceHttpsSoap12Endpoint/"/> </wsdl:port> <wsdl:port name="CloudControllerServiceHttpEndpoint" binding="ns:CloudControllerServiceHttpBinding"> - <http:address location="http://10.148.149.181:9764/services/CloudControllerService.CloudControllerServiceHttpEndpoint/"/> + <http:address location="http://192.168.1.2:9764/services/CloudControllerService.CloudControllerServiceHttpEndpoint/"/> </wsdl:port> <wsdl:port name="CloudControllerServiceHttpsEndpoint" binding="ns:CloudControllerServiceHttpBinding"> - <http:address location="https://10.148.149.181:9444/services/CloudControllerService.CloudControllerServiceHttpsEndpoint/"/> + <http:address location="https://192.168.1.2:9444/services/CloudControllerService.CloudControllerServiceHttpsEndpoint/"/> </wsdl:port> </wsdl:service> </wsdl:definitions> \ No newline at end of file
