You are viewing a plain text version of this content. The canonical link for it is here.
Posted to muse-commits@ws.apache.org by da...@apache.org on 2006/08/02 03:23:21 UTC
svn commit: r427835 - in /webservices/muse/trunk/modules/muse-wsn-api/specs:
WS-BaseNotification-1_3.wsdl WS-BaseNotification-1_3.xsd
Author: danj
Date: Tue Aug 1 18:23:20 2006
New Revision: 427835
URL: http://svn.apache.org/viewvc?rev=427835&view=rev
Log:
Fixes to add WS-A actions and WSRL properties in the WSN portTypes.
Modified:
webservices/muse/trunk/modules/muse-wsn-api/specs/WS-BaseNotification-1_3.wsdl
webservices/muse/trunk/modules/muse-wsn-api/specs/WS-BaseNotification-1_3.xsd
Modified: webservices/muse/trunk/modules/muse-wsn-api/specs/WS-BaseNotification-1_3.wsdl
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn-api/specs/WS-BaseNotification-1_3.wsdl?rev=427835&r1=427834&r2=427835&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsn-api/specs/WS-BaseNotification-1_3.wsdl (original)
+++ webservices/muse/trunk/modules/muse-wsn-api/specs/WS-BaseNotification-1_3.wsdl Tue Aug 1 18:23:20 2006
@@ -289,7 +289,7 @@
<!-- ========= NotificationConsumer PortType Definition =========== -->
<wsdl:portType name="NotificationConsumer">
<wsdl:operation name="Notify">
- <wsdl:input message="wsntw:Notify" />
+ <wsdl:input wsa:Action="http://docs.oasis-open.org/wsn/bw-2/NotificationConsumer/NotifyRequest" message="wsntw:Notify" />
</wsdl:operation>
</wsdl:portType>
@@ -375,46 +375,36 @@
wsrf-rp:ResourceProperties="wsnt:SubscriptionManagerRP">
<wsdl:operation name="Destroy">
- <wsdl:input wsa:Action="http://docs.oasis-open.org/wsrf/rlw-2/ImmediateResourceTermination/DestroyRequest"
- name="DestroyRequest" message="wsrf-rlw:DestroyRequest" />
- <wsdl:output wsa:Action="http://docs.oasis-open.org/wsrf/rlw-2/ImmediateResourceTermination/DestroyResponse"
- name="DestroyResponse" message="wsrf-rlw:DestroyResponse" />
+ <wsdl:input name="DestroyRequest" message="wsrf-rlw:DestroyRequest" />
+ <wsdl:output name="DestroyResponse" message="wsrf-rlw:DestroyResponse" />
<wsdl:fault name="ResourceNotDestroyedFault" message="wsrf-rlw:ResourceNotDestroyedFault" />
<wsdl:fault name="ResourceUnknownFault" message="wsrf-rw:ResourceUnknownFault" />
<wsdl:fault name="ResourceUnavailableFault" message="wsrf-rw:ResourceUnavailableFault"/>
</wsdl:operation>
<wsdl:operation name="SetTerminationTime">
- <wsdl:input wsa:Action="http://docs.oasis-open.org/wsrf/rlw-2/ScheduledResourceTermination/SetTerminationTimeRequest"
- name="SetTerminationTimeRequest" message="wsrf-rlw:SetTerminationTimeRequest" />
- <wsdl:output wsa:Action="http://docs.oasis-open.org/wsrf/rlw-2/ScheduledResourceTermination/SetTerminationTimeResponse"
- name="SetTerminationTimeResponse" message="wsrf-rlw:SetTerminationTimeResponse" />
+ <wsdl:input name="SetTerminationTimeRequest" message="wsrf-rlw:SetTerminationTimeRequest" />
+ <wsdl:output name="SetTerminationTimeResponse" message="wsrf-rlw:SetTerminationTimeResponse" />
<wsdl:fault name="UnableToSetTerminationTimeFault" message="wsrf-rlw:UnableToSetTerminationTimeFault" />
<wsdl:fault name="ResourceUnknownFault" message="wsrf-rw:ResourceUnknownFault" />
<wsdl:fault name="ResourceUnavailableFault" message="wsrf-rw:ResourceUnavailableFault"/>
<wsdl:fault name="TerminationTimeChangeRejectedFault" message="wsrf-rlw:TerminationTimeChangeRejectedFault" />
</wsdl:operation>
<wsdl:operation name="GetResourcePropertyDocument">
- <wsdl:input wsa:Action="http://docs.oasis-open.org/wsrf/rpw-2/GetResourcePropertyDocument/GetResourcePropertyDocumentRequest"
- name="GetResourcePropertyDocumentRequest" message="wsrf-rpw:GetResourcePropertyDocumentRequest"/>
- <wsdl:output wsa:Action="http://docs.oasis-open.org/wsrf/rpw-2/GetResourcePropertyDocument/GetResourcePropertyDocumentResponse"
- name="GetResourcePropertyDocumentResponse" message="wsrf-rpw:GetResourcePropertyDocumentResponse"/>
+ <wsdl:input name="GetResourcePropertyDocumentRequest" message="wsrf-rpw:GetResourcePropertyDocumentRequest"/>
+ <wsdl:output name="GetResourcePropertyDocumentResponse" message="wsrf-rpw:GetResourcePropertyDocumentResponse"/>
<wsdl:fault name="ResourceUnknownFault" message="wsrf-rw:ResourceUnknownFault"/>
<wsdl:fault name="ResourceUnavailableFault" message="wsrf-rw:ResourceUnavailableFault"/>
</wsdl:operation>
<wsdl:operation name="GetResourceProperty">
- <wsdl:input wsa:Action="http://docs.oasis-open.org/wsrf/rpw-2/GetResourceProperty/GetResourcePropertyRequest"
- name="GetResourcePropertyRequest" message="wsrf-rpw:GetResourcePropertyRequest" />
- <wsdl:output wsa:Action="http://docs.oasis-open.org/wsrf/rpw-2/GetResourceProperty/GetResourcePropertyResponse"
- name="GetResourcePropertyResponse" message="wsrf-rpw:GetResourcePropertyResponse" />
+ <wsdl:input name="GetResourcePropertyRequest" message="wsrf-rpw:GetResourcePropertyRequest" />
+ <wsdl:output name="GetResourcePropertyResponse" message="wsrf-rpw:GetResourcePropertyResponse" />
<wsdl:fault name="ResourceUnknownFault" message="wsrf-rw:ResourceUnknownFault"/>
<wsdl:fault name="ResourceUnavailableFault" message="wsrf-rw:ResourceUnavailableFault"/>
<wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrf-rpw:InvalidResourcePropertyQNameFault" />
</wsdl:operation>
<wsdl:operation name="GetMultipleResourceProperties">
- <wsdl:input wsa:Action="http://docs.oasis-open.org/wsrf/rpw-2/GetMultipleResourceProperties/GetMultipleResourcePropertiesRequest"
- name="GetMultipleResourcePropertiesRequest" message="wsrf-rpw:GetMultipleResourcePropertiesRequest" />
- <wsdl:output wsa:Action="http://docs.oasis-open.org/wsrf/rpw-2/GetMultipleResourceProperties/GetMultipleResourcePropertiesResponse"
- name="GetMultipleResourcePropertiesResponse" message="wsrf-rpw:GetMultipleResourcePropertiesResponse" />
+ <wsdl:input name="GetMultipleResourcePropertiesRequest" message="wsrf-rpw:GetMultipleResourcePropertiesRequest" />
+ <wsdl:output name="GetMultipleResourcePropertiesResponse" message="wsrf-rpw:GetMultipleResourcePropertiesResponse" />
<wsdl:fault name="ResourceUnknownFault" message="wsrf-rw:ResourceUnknownFault"/>
<wsdl:fault name="ResourceUnavailableFault" message="wsrf-rw:ResourceUnavailableFault"/>
<wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrf-rpw:InvalidResourcePropertyQNameFault" />
Modified: webservices/muse/trunk/modules/muse-wsn-api/specs/WS-BaseNotification-1_3.xsd
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn-api/specs/WS-BaseNotification-1_3.xsd?rev=427835&r1=427834&r2=427835&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsn-api/specs/WS-BaseNotification-1_3.xsd (original)
+++ webservices/muse/trunk/modules/muse-wsn-api/specs/WS-BaseNotification-1_3.xsd Tue Aug 1 18:23:20 2006
@@ -20,6 +20,7 @@
xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
xmlns:wsa="http://www.w3.org/2005/08/addressing"
xmlns:wsrf-bf="http://docs.oasis-open.org/wsrf/bf-2"
+ xmlns:wsrf-rl="http://docs.oasis-open.org/wsrf/rl-2"
xmlns:wstop="http://docs.oasis-open.org/wsn/t-1"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified" attributeFormDefault="unqualified">
@@ -33,6 +34,10 @@
<xsd:import namespace="http://docs.oasis-open.org/wsrf/bf-2"
schemaLocation="WS-BaseFaults-1_2.xsd"
/>
+
+ <xsd:import namespace="http://docs.oasis-open.org/wsrf/rl-2"
+ schemaLocation="WS-ResourceLifetime-1_2.xsd"
+ />
<xsd:import namespace="http://docs.oasis-open.org/wsn/t-1"
schemaLocation="WS-Topics-1_3.xsd"
/>
@@ -107,6 +112,8 @@
minOccurs="0" maxOccurs="1" />
<xsd:element ref="wsnt:CreationTime"
minOccurs="0" maxOccurs="1" />
+ <xsd:element ref="wsrf-rl:CurrentTime"/>
+ <xsd:element ref="wsrf-rl:TerminationTime"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org