Skip to content

Commit

Permalink
Indicated that security tokens can be of any format and extracted WS-…
Browse files Browse the repository at this point in the history 
…Security token format section for later revision

Reworded Post Response behaviour to indicate that no action is taken if the ISBM service provider cannot find a request message with the given ID
Add behaviour to Read Publication if LastMessageID doesn’t correspond to a message then a fault is thrown
Reworded Close Publication Session behaviour to indicate that all messages posted during the session are expired
Removed CreateTopic, DeleteTopic and GetTopic
Added RequestMessageID parameter for RemoveResponse
Made ChannelDescription mandatory (otherwise we get problems when using xs:any for security tokens)
  • Loading branch information
Avin Mathew committed Jul 25, 2012
1 parent ce8622f commit 23d78d3
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 246 deletions.
Binary file modified 0-Doc/OpenO&M Information Service Bus Model Specification Diagrams.pptx
View file
Binary file not shown.
Binary file modified 0-Doc/OpenO&M Information Service Bus Model Specification.docx
View file
Binary file not shown.
189 changes: 10 additions & 179 deletions 1-WSDL/ISBMChannelManagementService.wsdl
View file
Expand Up @@ -28,18 +28,18 @@
<xs:enumeration value="Response"/>
</xs:restriction>
</xs:simpleType>
<xs:element name="SecurityToken">
<xs:complexType>
<xs:sequence>
<xs:any minOccurs="1" maxOccurs="1" namespace="##any" processContents="lax"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:complexType name="Channel">
<xs:sequence>
<xs:element minOccurs="1" maxOccurs="1" name="ChannelURI" type="xs:string"/>
<xs:element minOccurs="1" maxOccurs="1" name="ChannelType" type="tns:ChannelType"/>
<xs:element minOccurs="0" maxOccurs="1" name="ChannelDescription" type="xs:string"/>
<xs:element minOccurs="0" maxOccurs="unbounded" name="TopicName" type="xs:string"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="Topic">
<xs:sequence>
<xs:element minOccurs="1" maxOccurs="1" name="TopicName" type="xs:string"/>
<xs:element minOccurs="0" maxOccurs="1" name="TopicDescription" type="xs:string"/>
</xs:sequence>
</xs:complexType>

Expand All @@ -51,30 +51,18 @@
<xs:element minOccurs="1" maxOccurs="1" name="ChannelURI" type="xs:string"/>
<xs:element minOccurs="1" maxOccurs="1" name="ChannelType" type="tns:ChannelType"/>
<xs:element minOccurs="0" maxOccurs="1" name="ChannelDescription" type="xs:string"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="wsse:SecurityTokenReference"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:SecurityToken"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="CreateChannelResponse">
<xs:complexType/>
</xs:element>
<xs:element name="CreateTopic">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="1" maxOccurs="1" name="ChannelURI" type="xs:string"/>
<xs:element minOccurs="1" maxOccurs="1" name="TopicName" type="xs:string"/>
<xs:element minOccurs="0" maxOccurs="1" name="TopicDescription" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="CreateTopicResponse">
<xs:complexType/>
</xs:element>
<xs:element name="AddSecurityTokens">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="1" maxOccurs="1" name="ChannelURI" type="xs:string"/>
<xs:element minOccurs="1" maxOccurs="unbounded" ref="wsse:SecurityTokenReference"/>
<xs:element minOccurs="1" maxOccurs="unbounded" ref="tns:SecurityToken"/>
</xs:sequence>
</xs:complexType>
</xs:element>
Expand All @@ -85,7 +73,7 @@
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="1" maxOccurs="1" name="ChannelURI" type="xs:string"/>
<xs:element minOccurs="1" maxOccurs="unbounded" ref="wsse:SecurityTokenReference"/>
<xs:element minOccurs="1" maxOccurs="unbounded" ref="tns:SecurityToken"/>
</xs:sequence>
</xs:complexType>
</xs:element>
Expand All @@ -102,17 +90,6 @@
<xs:element name="DeleteChannelResponse">
<xs:complexType/>
</xs:element>
<xs:element name="DeleteTopic">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="1" maxOccurs="1" name="ChannelURI" type="xs:string"/>
<xs:element minOccurs="1" maxOccurs="1" name="TopicName" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="DeleteTopicResponse">
<xs:complexType/>
</xs:element>
<xs:element name="GetChannel">
<xs:complexType>
<xs:sequence>
Expand All @@ -137,20 +114,6 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="GetTopics">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="1" maxOccurs="1" name="ChannelURI" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="GetTopicsResponse">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" name="Topic" type="tns:Topic"/>
</xs:sequence>
</xs:complexType>
</xs:element>

<!-- Fault elements -->

Expand All @@ -175,13 +138,6 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="InvalidTopicFault">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="1" maxOccurs="1" name="Description" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:schema>
</wsdl:types>

Expand All @@ -191,12 +147,6 @@
<wsdl:message name="CreateChannelOut">
<wsdl:part name="parameters" element="tns:CreateChannelResponse"/>
</wsdl:message>
<wsdl:message name="CreateTopicIn">
<wsdl:part name="parameters" element="tns:CreateTopic"/>
</wsdl:message>
<wsdl:message name="CreateTopicOut">
<wsdl:part name="parameters" element="tns:CreateTopicResponse"/>
</wsdl:message>
<wsdl:message name="AddSecurityTokensIn">
<wsdl:part name="parameters" element="tns:AddSecurityTokens"/>
</wsdl:message>
Expand All @@ -215,12 +165,6 @@
<wsdl:message name="DeleteChannelOut">
<wsdl:part name="parameters" element="tns:DeleteChannelResponse"/>
</wsdl:message>
<wsdl:message name="DeleteTopicIn">
<wsdl:part name="parameters" element="tns:DeleteTopic"/>
</wsdl:message>
<wsdl:message name="DeleteTopicOut">
<wsdl:part name="parameters" element="tns:DeleteTopicResponse"/>
</wsdl:message>
<wsdl:message name="GetChannelIn">
<wsdl:part name="parameters" element="tns:GetChannel"/>
</wsdl:message>
Expand All @@ -233,12 +177,6 @@
<wsdl:message name="GetChannelsOut">
<wsdl:part name="parameters" element="tns:GetChannelsResponse"/>
</wsdl:message>
<wsdl:message name="GetTopicsIn">
<wsdl:part name="parameters" element="tns:GetTopics"/>
</wsdl:message>
<wsdl:message name="GetTopicsOut">
<wsdl:part name="parameters" element="tns:GetTopicsResponse"/>
</wsdl:message>
<wsdl:message name="ChannelFault">
<wsdl:part name="parameters" element="tns:ChannelFault"/>
</wsdl:message>
Expand All @@ -248,9 +186,6 @@
<wsdl:message name="InvalidSecurityTokenFault">
<wsdl:part name="parameters" element="tns:InvalidSecurityTokenFault"/>
</wsdl:message>
<wsdl:message name="InvalidTopicFault">
<wsdl:part name="parameters" element="tns:InvalidTopicFault"/>
</wsdl:message>

<wsdl:portType name="ISBMChannelManagementService">
<wsdl:operation name="CreateChannel">
Expand All @@ -259,13 +194,6 @@
<wsdl:output message="tns:CreateChannelOut"/>
<wsdl:fault name="DuplicateChannelURIFault" message="tns:DuplicateChannelURIFault"/>
</wsdl:operation>
<wsdl:operation name="CreateTopic">
<wsdl:documentation>Creates a new topic on a channel.</wsdl:documentation>
<wsdl:input message="tns:CreateTopicIn"/>
<wsdl:output message="tns:CreateTopicOut"/>
<wsdl:fault name="ChannelFault" message="tns:ChannelFault"/>
<wsdl:fault name="InvalidOperationFault" message="tns:InvalidOperationFault"/>
</wsdl:operation>
<wsdl:operation name="AddSecurityTokens">
<wsdl:documentation>Adds security tokens to a channel.</wsdl:documentation>
<wsdl:input message="tns:AddSecurityTokensIn"/>
Expand All @@ -285,13 +213,6 @@
<wsdl:output message="tns:DeleteChannelOut"/>
<wsdl:fault name="ChannelFault" message="tns:ChannelFault"/>
</wsdl:operation>
<wsdl:operation name="DeleteTopic">
<wsdl:documentation>Deletes a topic from a channel.</wsdl:documentation>
<wsdl:input message="tns:DeleteTopicIn"/>
<wsdl:output message="tns:DeleteTopicOut"/>
<wsdl:fault name="ChannelFault" message="tns:ChannelFault"/>
<wsdl:fault name="InvalidTopicFault" message="tns:InvalidTopicFault"/>
</wsdl:operation>
<wsdl:operation name="GetChannel">
<wsdl:documentation>Gets information about a channel.</wsdl:documentation>
<wsdl:input message="tns:GetChannelIn"/>
Expand All @@ -303,12 +224,6 @@
<wsdl:input message="tns:GetChannelsIn"/>
<wsdl:output message="tns:GetChannelsOut"/>
</wsdl:operation>
<wsdl:operation name="GetTopics">
<wsdl:documentation>Gets all topics for a channel.</wsdl:documentation>
<wsdl:input message="tns:GetTopicsIn"/>
<wsdl:output message="tns:GetTopicsOut"/>
<wsdl:fault name="ChannelFault" message="tns:ChannelFault"/>
</wsdl:operation>
</wsdl:portType>

<wsdl:binding name="ISBMChannelManagementServiceSoap" type="tns:ISBMChannelManagementService">
Expand All @@ -325,21 +240,6 @@
<soap:fault name="DuplicateChannelURIFault" use="literal"/>
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="CreateTopic">
<soap:operation soapAction="http://www.openoandm.org/xml/ISBM/CreateTopic" style="document"/>
<wsdl:input>
<soap:body use="literal"/>
</wsdl:input>
<wsdl:output>
<soap:body use="literal"/>
</wsdl:output>
<wsdl:fault name="ChannelFault">
<soap:fault name="ChannelFault" use="literal"/>
</wsdl:fault>
<wsdl:fault name="InvalidOperationFault">
<soap:fault name="InvalidOperationFault" use="literal"/>
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="AddSecurityTokens">
<soap:operation soapAction="http://www.openoandm.org/xml/ISBM/AddSecurityTokens" style="document"/>
<wsdl:input>
Expand Down Expand Up @@ -379,21 +279,6 @@
<soap:fault name="ChannelFault" use="literal"/>
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="DeleteTopic">
<soap:operation soapAction="http://www.openoandm.org/xml/ISBM/DeleteTopic" style="document"/>
<wsdl:input>
<soap:body use="literal"/>
</wsdl:input>
<wsdl:output>
<soap:body use="literal"/>
</wsdl:output>
<wsdl:fault name="ChannelFault">
<soap:fault name="ChannelFault" use="literal"/>
</wsdl:fault>
<wsdl:fault name="InvalidTopicFault">
<soap:fault name="InvalidTopicFault" use="literal"/>
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="GetChannel">
<soap:operation soapAction="http://www.openoandm.org/xml/ISBM/GetChannel" style="document"/>
<wsdl:input>
Expand All @@ -415,18 +300,6 @@
<soap:body use="literal"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="GetTopics">
<soap:operation soapAction="http://www.openoandm.org/xml/ISBM/GetTopics" style="document"/>
<wsdl:input>
<soap:body use="literal"/>
</wsdl:input>
<wsdl:output>
<soap:body use="literal"/>
</wsdl:output>
<wsdl:fault name="ChannelFault">
<soap:fault name="ChannelFault" use="literal"/>
</wsdl:fault>
</wsdl:operation>
</wsdl:binding>

<wsdl:binding name="ISBMChannelManagementServiceSoap12" type="tns:ISBMChannelManagementService">
Expand All @@ -443,21 +316,6 @@
<soap12:fault name="DuplicateChannelURIFault" use="literal"/>
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="CreateTopic">
<soap12:operation soapAction="http://www.openoandm.org/xml/ISBM/CreateTopic" style="document"/>
<wsdl:input>
<soap12:body use="literal"/>
</wsdl:input>
<wsdl:output>
<soap12:body use="literal"/>
</wsdl:output>
<wsdl:fault name="ChannelFault">
<soap12:fault name="ChannelFault" use="literal"/>
</wsdl:fault>
<wsdl:fault name="InvalidOperationFault">
<soap12:fault name="InvalidOperationFault" use="literal"/>
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="AddSecurityTokens">
<soap12:operation soapAction="http://www.openoandm.org/xml/ISBM/AddSecurityTokens" style="document"/>
<wsdl:input>
Expand Down Expand Up @@ -497,21 +355,6 @@
<soap12:fault name="ChannelFault" use="literal"/>
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="DeleteTopic">
<soap12:operation soapAction="http://www.openoandm.org/xml/ISBM/DeleteTopic" style="document"/>
<wsdl:input>
<soap12:body use="literal"/>
</wsdl:input>
<wsdl:output>
<soap12:body use="literal"/>
</wsdl:output>
<wsdl:fault name="ChannelFault">
<soap12:fault name="ChannelFault" use="literal"/>
</wsdl:fault>
<wsdl:fault name="InvalidTopicFault">
<soap12:fault name="InvalidTopicFault" use="literal"/>
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="GetChannel">
<soap12:operation soapAction="http://www.openoandm.org/xml/ISBM/GetChannel" style="document"/>
<wsdl:input>
Expand All @@ -533,18 +376,6 @@
<soap12:body use="literal"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="GetTopics">
<soap12:operation soapAction="http://www.openoandm.org/xml/ISBM/GetTopics" style="document"/>
<wsdl:input>
<soap12:body use="literal"/>
</wsdl:input>
<wsdl:output>
<soap12:body use="literal"/>
</wsdl:output>
<wsdl:fault name="ChannelFault">
<soap12:fault name="ChannelFault" use="literal"/>
</wsdl:fault>
</wsdl:operation>
</wsdl:binding>

<wsdl:service name="ISBMChannelManagementService">
Expand Down

0 comments on commit 23d78d3

Please sign in to comment.