Repository: stratos Updated Branches: refs/heads/master a4af14ff8 -> e7b60f781
Adding tenantId to policies and removing mandatory isPublic from test-schema Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e7b60f78 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e7b60f78 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e7b60f78 Branch: refs/heads/master Commit: e7b60f7812141066e622a4d84f4b20a3074fce64 Parents: a4af14f Author: Shiro <[email protected]> Authored: Wed Sep 24 21:23:18 2014 +0530 Committer: Shiro <[email protected]> Committed: Wed Sep 24 21:23:18 2014 +0530 ---------------------------------------------------------------------- .../webapp/stratos-test/WEB-INF/schemas/schema.xsd | 10 +++++----- .../src/main/resources/AutoScalerService.wsdl | 17 +++++------------ 2 files changed, 10 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/e7b60f78/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos-test/WEB-INF/schemas/schema.xsd ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos-test/WEB-INF/schemas/schema.xsd b/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos-test/WEB-INF/schemas/schema.xsd index ad37c12..c084b06 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos-test/WEB-INF/schemas/schema.xsd +++ b/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos-test/WEB-INF/schemas/schema.xsd @@ -19,7 +19,7 @@ <xs:sequence> <xs:element name="id" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/> <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1" nillable="true"/> - <xs:element name="isPublic" type="xs:boolean" minOccurs="1" maxOccurs="1" nillable="false"/> + <xs:element name="isPublic" type="xs:boolean" minOccurs="0" maxOccurs="1" nillable="false"/> <xs:element name="provider" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/> <xs:element name="property" minOccurs="1" maxOccurs="unbounded"> <xs:complexType> @@ -38,7 +38,7 @@ <xs:sequence> <xs:element name="id" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/> <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1" nillable="true"/> - <xs:element name="isPublic" type="xs:boolean" minOccurs="1" maxOccurs="1" nillable="false"/> + <xs:element name="isPublic" type="xs:boolean" minOccurs="0" maxOccurs="1" nillable="false"/> <xs:element name="loadThresholds" minOccurs="1" maxOccurs="1" nillable="false"> <xs:complexType> <xs:all> @@ -57,7 +57,7 @@ <xs:sequence> <xs:element name="id" type="xs:string" maxOccurs="1" minOccurs="1" nillable="false"/> <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1" nillable="true"/> - <xs:element name="isPublic" type="xs:boolean" minOccurs="1" maxOccurs="1" nillable="false"/> + <xs:element name="isPublic" type="xs:boolean" minOccurs="0" maxOccurs="1" nillable="false"/> <xs:element name="partitionGroup"> <xs:complexType> <xs:sequence> @@ -91,7 +91,7 @@ <xs:complexType> <xs:sequence> <xs:element name="type" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/> - <xs:element name="isPublic" type="xs:boolean" minOccurs="1" maxOccurs="1" nillable="false"/> + <xs:element name="isPublic" type="xs:boolean" minOccurs="0" maxOccurs="1" nillable="false"/> <xs:element name="provider" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/> <xs:element name="host" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/> <xs:element name="displayName" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/> @@ -200,7 +200,7 @@ <xs:complexType> <xs:all> <xs:element name="serviceName" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/> - <xs:element name="isPublic" type="xs:boolean" minOccurs="1" maxOccurs="1" nillable="false"/> + <xs:element name="isPublic" type="xs:boolean" minOccurs="0" maxOccurs="1" nillable="false"/> <xs:element name="cartridgeType" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/> <xs:element name="deploymentPolicyName" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/> <xs:element name="autoscalingPolicyName" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/> http://git-wip-us.apache.org/repos/asf/stratos/blob/e7b60f78/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl ---------------------------------------------------------------------- diff --git a/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl b/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl index 5bb9e92..82e287b 100644 --- a/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl +++ b/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl @@ -338,6 +338,7 @@ <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/> <xs:element minOccurs="0" name="loadThresholds" nillable="true" type="ax214:LoadThresholds"/> + <xs:element minOccurs="0" name="tenantId" type="xs:int"/> </xs:sequence> </xs:complexType> <xs:complexType name="LoadThresholds"> @@ -376,6 +377,7 @@ <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/> <xs:element maxOccurs="unbounded" minOccurs="0" name="partitionGroups" nillable="true" type="ax28:PartitionGroup"/> + <xs:element minOccurs="0" name="tenantId" type="xs:int"/> </xs:sequence> </xs:complexType> </xs:schema> @@ -1140,23 +1142,14 @@ </wsdl:operation> </wsdl:binding> <wsdl:service name="AutoScalerService"> - <wsdl:port name="AutoScalerServiceHttpSoap11Endpoint" binding="ns:AutoScalerServiceSoap11Binding"> - <soap:address location="http://192.168.0.100:9763/services/AutoScalerService.AutoScalerServiceHttpSoap11Endpoint/"/> - </wsdl:port> <wsdl:port name="AutoScalerServiceHttpsSoap11Endpoint" binding="ns:AutoScalerServiceSoap11Binding"> - <soap:address location="https://192.168.0.100:9443/services/AutoScalerService.AutoScalerServiceHttpsSoap11Endpoint/"/> + <soap:address location="https://192.168.122.1:9443/services/AutoScalerService.AutoScalerServiceHttpsSoap11Endpoint/"/> </wsdl:port> <wsdl:port name="AutoScalerServiceHttpsSoap12Endpoint" binding="ns:AutoScalerServiceSoap12Binding"> - <soap12:address location="https://192.168.0.100:9443/services/AutoScalerService.AutoScalerServiceHttpsSoap12Endpoint/"/> - </wsdl:port> - <wsdl:port name="AutoScalerServiceHttpSoap12Endpoint" binding="ns:AutoScalerServiceSoap12Binding"> - <soap12:address location="http://192.168.0.100:9763/services/AutoScalerService.AutoScalerServiceHttpSoap12Endpoint/"/> - </wsdl:port> - <wsdl:port name="AutoScalerServiceHttpEndpoint" binding="ns:AutoScalerServiceHttpBinding"> - <http:address location="http://192.168.0.100:9763/services/AutoScalerService.AutoScalerServiceHttpEndpoint/"/> + <soap12:address location="https://192.168.122.1:9443/services/AutoScalerService.AutoScalerServiceHttpsSoap12Endpoint/"/> </wsdl:port> <wsdl:port name="AutoScalerServiceHttpsEndpoint" binding="ns:AutoScalerServiceHttpBinding"> - <http:address location="https://192.168.0.100:9443/services/AutoScalerService.AutoScalerServiceHttpsEndpoint/"/> + <http:address location="https://192.168.122.1:9443/services/AutoScalerService.AutoScalerServiceHttpsEndpoint/"/> </wsdl:port> </wsdl:service> </wsdl:definitions> \ No newline at end of file
