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/07/14 02:38:05 UTC

svn commit: r421769 - in /webservices/muse/trunk/modules/muse-wsrf/specs: WS-ResourceMetadataDescriptor-CD-01.wsdl WS-ServiceGroup-1_2.wsdl WS-ServiceGroupEntry-1_2.wsdl

Author: danj
Date: Thu Jul 13 17:38:04 2006
New Revision: 421769

URL: http://svn.apache.org/viewvc?rev=421769&view=rev
Log:
Updated official OASIS specs to abide by WS-A convention of putting WS-A Action in the WSDL 
operation parts. This applies to the MUSE-28 fix.

Modified:
    webservices/muse/trunk/modules/muse-wsrf/specs/WS-ResourceMetadataDescriptor-CD-01.wsdl
    webservices/muse/trunk/modules/muse-wsrf/specs/WS-ServiceGroup-1_2.wsdl
    webservices/muse/trunk/modules/muse-wsrf/specs/WS-ServiceGroupEntry-1_2.wsdl

Modified: webservices/muse/trunk/modules/muse-wsrf/specs/WS-ResourceMetadataDescriptor-CD-01.wsdl
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf/specs/WS-ResourceMetadataDescriptor-CD-01.wsdl?rev=421769&r1=421768&r2=421769&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf/specs/WS-ResourceMetadataDescriptor-CD-01.wsdl (original)
+++ webservices/muse/trunk/modules/muse-wsrf/specs/WS-ResourceMetadataDescriptor-CD-01.wsdl Thu Jul 13 17:38:04 2006
@@ -8,7 +8,8 @@
 	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
 	xmlns:wsrf-r="http://docs.oasis-open.org/wsrf/r-2" 
 	xmlns:wsrf-bf="http://docs.oasis-open.org/wsrf/bf-2" 
-	xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/rp-2"
+	xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/rp-2" 
+	xmlns:wsa="http://www.w3.org/2005/08/addressing" 
 	name="MetadataResource">
 	<wsdl:types>
 		<xsd:schema 
@@ -67,21 +68,27 @@
 		name="MetadataResourcePortType" 
 	    wsrf-rp:ResourceProperties="tns:MetadataResourceRP">
 		<wsdl:operation name="GetResourcePropertyDocument">
-			<wsdl:input name="GetResourcePropertyDocumentRequest" message="tns:GetResourcePropertyDocumentRequest"/>
-			<wsdl:output name="GetResourcePropertyDocumentResponse" message="tns:GetResourcePropertyDocumentResponse"/>
+			<wsdl:input wsa:Action="http://docs.oasis-open.org/wsrf/rpw-2/GetResourcePropertyDocument/GetResourcePropertyDocumentRequest" 
+			            name="GetResourcePropertyDocumentRequest" message="tns:GetResourcePropertyDocumentRequest"/>
+			<wsdl:output wsa:Action="http://docs.oasis-open.org/wsrf/rpw-2/GetResourcePropertyDocument/GetResourcePropertyDocumentResponse" 
+			             name="GetResourcePropertyDocumentResponse" message="tns:GetResourcePropertyDocumentResponse"/>
 			<wsdl:fault name="ResourceUnknownFault" message="tns:ResourceUnknownFault"/>
 			<wsdl:fault name="ResourceUnavailableFault" message="tns:ResourceUnavailableFault"/>
 		</wsdl:operation>
 		<wsdl:operation name="GetResourceProperty">
-			<wsdl:input name="GetResourcePropertyRequest" message="tns:GetResourcePropertyRequest" />
-			<wsdl:output name="GetResourcePropertyResponse" message="tns:GetResourcePropertyResponse" />
+			<wsdl:input wsa:Action="http://docs.oasis-open.org/wsrf/rpw-2/GetResourceProperty/GetResourcePropertyRequest" 
+			            name="GetResourcePropertyRequest" message="tns:GetResourcePropertyRequest" />
+			<wsdl:output wsa:Action="http://docs.oasis-open.org/wsrf/rpw-2/GetResourceProperty/GetResourcePropertyResponse" 
+			             name="GetResourcePropertyResponse" message="tns:GetResourcePropertyResponse" />
 			<wsdl:fault name="ResourceUnknownFault" message="tns:ResourceUnknownFault"/>
 			<wsdl:fault name="ResourceUnavailableFault" message="tns:ResourceUnavailableFault"/>
 			<wsdl:fault name="InvalidResourcePropertyQNameFault" message="tns:InvalidResourcePropertyQNameFault" />
 		</wsdl:operation>
 		<wsdl:operation name="GetMultipleResourceProperties">
-			<wsdl:input name="GetMultipleResourcePropertiesRequest" message="tns:GetMultipleResourcePropertiesRequest" />
-			<wsdl:output name="GetMultipleResourcePropertiesResponse" message="tns:GetMultipleResourcePropertiesResponse" />
+			<wsdl:input wsa:Action="http://docs.oasis-open.org/wsrf/rpw-2/GetMultipleResourceProperties/GetMultipleResourcePropertiesRequest" 
+			            name="GetMultipleResourcePropertiesRequest" message="tns:GetMultipleResourcePropertiesRequest" />
+			<wsdl:output wsa:Action="http://docs.oasis-open.org/wsrf/rpw-2/GetMultipleResourceProperties/GetMultipleResourcePropertiesResponse" 
+			             name="GetMultipleResourcePropertiesResponse" message="tns:GetMultipleResourcePropertiesResponse" />
 			<wsdl:fault name="ResourceUnknownFault" message="tns:ResourceUnknownFault"/>
 			<wsdl:fault name="ResourceUnavailableFault" message="tns:ResourceUnavailableFault"/>
 			<wsdl:fault name="InvalidResourcePropertyQNameFault" message="tns:InvalidResourcePropertyQNameFault" />

Modified: webservices/muse/trunk/modules/muse-wsrf/specs/WS-ServiceGroup-1_2.wsdl
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf/specs/WS-ServiceGroup-1_2.wsdl?rev=421769&r1=421768&r2=421769&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf/specs/WS-ServiceGroup-1_2.wsdl (original)
+++ webservices/muse/trunk/modules/muse-wsrf/specs/WS-ServiceGroup-1_2.wsdl Thu Jul 13 17:38:04 2006
@@ -5,7 +5,7 @@
     xmlns:wsrf-sg="http://docs.oasis-open.org/wsrf/sg-2" 
     xmlns:wsrf-sgw="http://docs.oasis-open.org/wsrf/sgw-2" 
 	xmlns="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:wsa="http://www.w3.org/ws/2005/08/addressing"
+	xmlns:wsa="http://www.w3.org/2005/08/addressing"
 	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
 	xmlns:wsdl-soap="http://schemas.xmlsoap.org/wsdl/soap/"
 	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -89,32 +89,42 @@
 		name="ServiceGroupPortType" 
 	    wsrf-rp:ResourceProperties="wsrf-sg:ServiceGroupRP">
 		<wsdl:operation name="GetMetadata">
-			<wsdl:input name="GetMetadataMsg" message="tns:GetMetadataMsg"/>
-			<wsdl:output name="GetMetadataResponseMsg" message="tns:GetMetadataResponseMsg"/>
+			<wsdl:input wsa:Action="http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata" 
+			            name="GetMetadataMsg" message="tns:GetMetadataMsg"/>
+			<wsdl:output wsa:Action="http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadataResponse" 
+			             name="GetMetadataResponseMsg" message="tns:GetMetadataResponseMsg"/>
 		</wsdl:operation>
 		<wsdl:operation name="GetResourcePropertyDocument">
-			<wsdl:input name="GetResourcePropertyDocumentRequest" message="tns:GetResourcePropertyDocumentRequest"/>
-			<wsdl:output name="GetResourcePropertyDocumentResponse" message="tns:GetResourcePropertyDocumentResponse"/>
+			<wsdl:input wsa:Action="http://docs.oasis-open.org/wsrf/rpw-2/GetResourcePropertyDocument/GetResourcePropertyDocumentRequest" 
+			            name="GetResourcePropertyDocumentRequest" message="tns:GetResourcePropertyDocumentRequest"/>
+			<wsdl:output wsa:Action="http://docs.oasis-open.org/wsrf/rpw-2/GetResourcePropertyDocument/GetResourcePropertyDocumentResponse" 
+			             name="GetResourcePropertyDocumentResponse" message="tns:GetResourcePropertyDocumentResponse"/>
 			<wsdl:fault name="ResourceUnknownFault" message="tns:ResourceUnknownFault"/>
 			<wsdl:fault name="ResourceUnavailableFault" message="tns:ResourceUnavailableFault"/>
 		</wsdl:operation>
 		<wsdl:operation name="GetResourceProperty">
-			<wsdl:input name="GetResourcePropertyRequest" message="tns:GetResourcePropertyRequest" />
-			<wsdl:output name="GetResourcePropertyResponse" message="tns:GetResourcePropertyResponse" />
+			<wsdl:input wsa:Action="http://docs.oasis-open.org/wsrf/rpw-2/GetResourceProperty/GetResourcePropertyRequest" 
+			            name="GetResourcePropertyRequest" message="tns:GetResourcePropertyRequest" />
+			<wsdl:output wsa:Action="http://docs.oasis-open.org/wsrf/rpw-2/GetResourceProperty/GetResourcePropertyResponse" 
+			             name="GetResourcePropertyResponse" message="tns:GetResourcePropertyResponse" />
 			<wsdl:fault name="ResourceUnknownFault" message="tns:ResourceUnknownFault"/>
 			<wsdl:fault name="ResourceUnavailableFault" message="tns:ResourceUnavailableFault"/>
 			<wsdl:fault name="InvalidResourcePropertyQNameFault" message="tns:InvalidResourcePropertyQNameFault" />
 		</wsdl:operation>
 		<wsdl:operation name="GetMultipleResourceProperties">
-			<wsdl:input name="GetMultipleResourcePropertiesRequest" message="tns:GetMultipleResourcePropertiesRequest" />
-			<wsdl:output name="GetMultipleResourcePropertiesResponse" message="tns:GetMultipleResourcePropertiesResponse" />
+			<wsdl:input wsa:Action="http://docs.oasis-open.org/wsrf/rpw-2/GetMultipleResourceProperties/GetMultipleResourcePropertiesRequest" 
+			            name="GetMultipleResourcePropertiesRequest" message="tns:GetMultipleResourcePropertiesRequest" />
+			<wsdl:output wsa:Action="http://docs.oasis-open.org/wsrf/rpw-2/GetMultipleResourceProperties/GetMultipleResourcePropertiesResponse" 
+			             name="GetMultipleResourcePropertiesResponse" message="tns:GetMultipleResourcePropertiesResponse" />
 			<wsdl:fault name="ResourceUnknownFault" message="tns:ResourceUnknownFault"/>
 			<wsdl:fault name="ResourceUnavailableFault" message="tns:ResourceUnavailableFault"/>
 			<wsdl:fault name="InvalidResourcePropertyQNameFault" message="tns:InvalidResourcePropertyQNameFault" />
     	</wsdl:operation>
 		<wsdl:operation name="QueryResourceProperties">
-			<wsdl:input name="QueryResourcePropertiesRequest" message="tns:QueryResourcePropertiesRequest" />
-			<wsdl:output name="QueryResourcePropertiesResponse" message="tns:QueryResourcePropertiesResponse" />
+			<wsdl:input wsa:Action="http://docs.oasis-open.org/wsrf/rpw-2/QueryResourceProperties/QueryResourcePropertiesRequest" 
+			            name="QueryResourcePropertiesRequest" message="tns:QueryResourcePropertiesRequest" />
+			<wsdl:output wsa:Action="http://docs.oasis-open.org/wsrf/rpw-2/QueryResourceProperties/QueryResourcePropertiesResponse" 
+			             name="QueryResourcePropertiesResponse" message="tns:QueryResourcePropertiesResponse" />
 			<wsdl:fault name="ResourceUnknownFault" message="tns:ResourceUnknownFault"/>
 			<wsdl:fault name="ResourceUnavailableFault" message="tns:ResourceUnavailableFault"/>
 			<wsdl:fault name="UnknownQueryExpressionDialectFault" message="tns:UnknownQueryExpressionDialectFault"/>
@@ -253,7 +263,7 @@
     </wsdl:binding>
 	<wsdl:service name="ServiceGroupService">
     	<wsdl:port name="ServiceGroupPort" binding="tns:ServiceGroupBinding">
-    		<wsdl-soap:address location="http://localhost:8080/test-wsrf/services/ServiceGroup"/>
+    		<wsdl-soap:address location="http://localhost:8080/wsrf/services/ServiceGroup"/>
     	</wsdl:port>
 	</wsdl:service>
 </wsdl:definitions>

Modified: webservices/muse/trunk/modules/muse-wsrf/specs/WS-ServiceGroupEntry-1_2.wsdl
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf/specs/WS-ServiceGroupEntry-1_2.wsdl?rev=421769&r1=421768&r2=421769&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf/specs/WS-ServiceGroupEntry-1_2.wsdl (original)
+++ webservices/muse/trunk/modules/muse-wsrf/specs/WS-ServiceGroupEntry-1_2.wsdl Thu Jul 13 17:38:04 2006
@@ -5,7 +5,7 @@
     xmlns:wsrf-sg="http://docs.oasis-open.org/wsrf/sg-2" 
     xmlns:wsrf-sgw="http://docs.oasis-open.org/wsrf/sgw-2" 
 	xmlns="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:wsa="http://www.w3.org/ws/2005/08/addressing"
+	xmlns:wsa="http://www.w3.org/2005/08/addressing"
 	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
 	xmlns:wsdl-soap="http://schemas.xmlsoap.org/wsdl/soap/"
 	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -74,25 +74,33 @@
 		name="ServiceGroupEntryPortType" 
 	    wsrf-rp:ResourceProperties="wsrf-sg:ServiceGroupEntryRP">
 		<wsdl:operation name="GetMetadata">
-			<wsdl:input name="GetMetadataMsg" message="tns:GetMetadataMsg"/>
-			<wsdl:output name="GetMetadataResponseMsg" message="tns:GetMetadataResponseMsg"/>
+			<wsdl:input wsa:Action="http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata" 
+			            name="GetMetadataMsg" message="tns:GetMetadataMsg"/>
+			<wsdl:output wsa:Action="http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadataResponse" 
+			             name="GetMetadataResponseMsg" message="tns:GetMetadataResponseMsg"/>
 		</wsdl:operation>
 		<wsdl:operation name="GetResourcePropertyDocument">
-			<wsdl:input name="GetResourcePropertyDocumentRequest" message="tns:GetResourcePropertyDocumentRequest"/>
-			<wsdl:output name="GetResourcePropertyDocumentResponse" message="tns:GetResourcePropertyDocumentResponse"/>
+			<wsdl:input wsa:Action="http://docs.oasis-open.org/wsrf/rpw-2/GetResourcePropertyDocument/GetResourcePropertyDocumentRequest" 
+			            name="GetResourcePropertyDocumentRequest" message="tns:GetResourcePropertyDocumentRequest"/>
+			<wsdl:output wsa:Action="http://docs.oasis-open.org/wsrf/rpw-2/GetResourcePropertyDocument/GetResourcePropertyDocumentResponse" 
+			             name="GetResourcePropertyDocumentResponse" message="tns:GetResourcePropertyDocumentResponse"/>
 			<wsdl:fault name="ResourceUnknownFault" message="tns:ResourceUnknownFault"/>
 			<wsdl:fault name="ResourceUnavailableFault" message="tns:ResourceUnavailableFault"/>
 		</wsdl:operation>
 		<wsdl:operation name="GetResourceProperty">
-			<wsdl:input name="GetResourcePropertyRequest" message="tns:GetResourcePropertyRequest" />
-			<wsdl:output name="GetResourcePropertyResponse" message="tns:GetResourcePropertyResponse" />
+			<wsdl:input wsa:Action="http://docs.oasis-open.org/wsrf/rpw-2/GetResourceProperty/GetResourcePropertyRequest" 
+			            name="GetResourcePropertyRequest" message="tns:GetResourcePropertyRequest" />
+			<wsdl:output wsa:Action="http://docs.oasis-open.org/wsrf/rpw-2/GetResourceProperty/GetResourcePropertyResponse" 
+			             name="GetResourcePropertyResponse" message="tns:GetResourcePropertyResponse" />
 			<wsdl:fault name="ResourceUnknownFault" message="tns:ResourceUnknownFault"/>
 			<wsdl:fault name="ResourceUnavailableFault" message="tns:ResourceUnavailableFault"/>
 			<wsdl:fault name="InvalidResourcePropertyQNameFault" message="tns:InvalidResourcePropertyQNameFault" />
 		</wsdl:operation>
 		<wsdl:operation name="GetMultipleResourceProperties">
-			<wsdl:input name="GetMultipleResourcePropertiesRequest" message="tns:GetMultipleResourcePropertiesRequest" />
-			<wsdl:output name="GetMultipleResourcePropertiesResponse" message="tns:GetMultipleResourcePropertiesResponse" />
+			<wsdl:input wsa:Action="http://docs.oasis-open.org/wsrf/rpw-2/GetMultipleResourceProperties/GetMultipleResourcePropertiesRequest" 
+			            name="GetMultipleResourcePropertiesRequest" message="tns:GetMultipleResourcePropertiesRequest" />
+			<wsdl:output wsa:Action="http://docs.oasis-open.org/wsrf/rpw-2/GetMultipleResourceProperties/GetMultipleResourcePropertiesResponse" 
+			             name="GetMultipleResourcePropertiesResponse" message="tns:GetMultipleResourcePropertiesResponse" />
 			<wsdl:fault name="ResourceUnknownFault" message="tns:ResourceUnknownFault"/>
 			<wsdl:fault name="ResourceUnavailableFault" message="tns:ResourceUnavailableFault"/>
 			<wsdl:fault name="InvalidResourcePropertyQNameFault" message="tns:InvalidResourcePropertyQNameFault" />
@@ -192,7 +200,7 @@
     </wsdl:binding>
 	<wsdl:service name="ServiceGroupEntryService">
     	<wsdl:port name="ServiceGroupEntryPort" binding="tns:ServiceGroupEntryBinding">
-    		<wsdl-soap:address location="http://localhost:8080/test-wsrf/services/ServiceGroupEntry"/>
+    		<wsdl-soap:address location="http://localhost:8080/wsrf/services/ServiceGroupEntry"/>
     	</wsdl:port>
 	</wsdl:service>
 </wsdl:definitions>



---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org