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:55 UTC
svn commit: r421771 - in /webservices/muse/trunk/samples:
simple/src/org/apache/muse/test/simple/ simple/wsdl/
wsrf/src/org/apache/muse/test/wsrf/ wsrf/wsdl/
Author: danj
Date: Thu Jul 13 17:38:54 2006
New Revision: 421771
URL: http://svn.apache.org/viewvc?rev=421771&view=rev
Log:
Updated sample code and WSDLs to reflect fix for MUSE-28.
Modified:
webservices/muse/trunk/samples/simple/src/org/apache/muse/test/simple/SimpleResourceClient.java
webservices/muse/trunk/samples/simple/src/org/apache/muse/test/simple/SimpleTestClient.java
webservices/muse/trunk/samples/simple/wsdl/SimpleResource.wsdl
webservices/muse/trunk/samples/wsrf/src/org/apache/muse/test/wsrf/WsrfTestClient.java
webservices/muse/trunk/samples/wsrf/wsdl/WS-ResourceMetadataDescriptor-CD-01.wsdl
webservices/muse/trunk/samples/wsrf/wsdl/WS-ServiceGroup-1_2.wsdl
webservices/muse/trunk/samples/wsrf/wsdl/WS-ServiceGroupEntry-1_2.wsdl
webservices/muse/trunk/samples/wsrf/wsdl/WsResource.wsdl
Modified: webservices/muse/trunk/samples/simple/src/org/apache/muse/test/simple/SimpleResourceClient.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/samples/simple/src/org/apache/muse/test/simple/SimpleResourceClient.java?rev=421771&r1=421770&r2=421771&view=diff
==============================================================================
--- webservices/muse/trunk/samples/simple/src/org/apache/muse/test/simple/SimpleResourceClient.java (original)
+++ webservices/muse/trunk/samples/simple/src/org/apache/muse/test/simple/SimpleResourceClient.java Thu Jul 13 17:38:54 2006
@@ -16,21 +16,18 @@
package org.apache.muse.test.simple;
-import java.net.URI;
-
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
import org.apache.muse.core.AbstractResourceClient;
+import org.apache.muse.test.simple.first.FirstCapability;
+import org.apache.muse.test.simple.second.SecondCapability;
import org.apache.muse.util.xml.XmlUtils;
import org.apache.muse.ws.addressing.EndpointReference;
import org.apache.muse.ws.addressing.soap.SoapClient;
import org.apache.muse.ws.addressing.soap.SoapFault;
-import org.apache.muse.test.simple.first.FirstCapability;
-import org.apache.muse.test.simple.second.SecondCapability;
-
/**
*
* SimpleResourceClient is a web services client that implements the
@@ -64,22 +61,19 @@
public String firstOperation(String param1)
throws SoapFault
{
- URI action = URI.create(FirstCapability.FIRST_OP_URI);
Element body = XmlUtils.createElement(FirstCapability.FIRST_OP_QNAME, param1);
- Element response = invoke(action, body);
+ Element response = invoke(FirstCapability.FIRST_OP_URI, body);
return XmlUtils.extractText(response);
}
public boolean secondOperation(int param1, QName param2)
throws SoapFault
{
- URI action = URI.create(SecondCapability.SECOND_OP_URI);
-
Element body = XmlUtils.createElement(SecondCapability.SECOND_OP_QNAME);
XmlUtils.setElement(body, SecondCapability.PARAM1_QNAME, new Integer(param1));
XmlUtils.setElement(body, SecondCapability.PARAM2_QNAME, param2);
- Element response = invoke(action, body);
+ Element response = invoke(SecondCapability.SECOND_OP_URI, body);
return XmlUtils.getBoolean(response).booleanValue();
}
}
Modified: webservices/muse/trunk/samples/simple/src/org/apache/muse/test/simple/SimpleTestClient.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/samples/simple/src/org/apache/muse/test/simple/SimpleTestClient.java?rev=421771&r1=421770&r2=421771&view=diff
==============================================================================
--- webservices/muse/trunk/samples/simple/src/org/apache/muse/test/simple/SimpleTestClient.java (original)
+++ webservices/muse/trunk/samples/simple/src/org/apache/muse/test/simple/SimpleTestClient.java Thu Jul 13 17:38:54 2006
@@ -47,7 +47,7 @@
{
ResourceIdFactory factory = new CounterResourceIdFactory();
QName name = factory.getIdentifierName();
- URI value = factory.getNextIdentifier();
+ String value = factory.getNextIdentifier();
epr.addParameter(name, value);
}
@@ -77,7 +77,7 @@
//
// change these to point to different applications/servers
//
- String contextPath = "/simple/services/SimpleResource";
+ String contextPath = "/test-simple/services/SimpleResource";
int port = 8080;
//
Modified: webservices/muse/trunk/samples/simple/wsdl/SimpleResource.wsdl
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/samples/simple/wsdl/SimpleResource.wsdl?rev=421771&r1=421770&r2=421771&view=diff
==============================================================================
--- webservices/muse/trunk/samples/simple/wsdl/SimpleResource.wsdl (original)
+++ webservices/muse/trunk/samples/simple/wsdl/SimpleResource.wsdl Thu Jul 13 17:38:54 2006
@@ -3,7 +3,7 @@
targetNamespace="http://ws.apache.org/muse/test/simple"
xmlns:tns="http://ws.apache.org/muse/test/simple"
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"
@@ -14,6 +14,11 @@
<wsdl:types>
<xsd:schema
elementFormDefault="qualified"
+ targetNamespace="http://www.w3.org/2005/08/addressing">
+ <xsd:include schemaLocation="WS-Addressing-2005_08.xsd"/>
+ </xsd:schema>
+ <xsd:schema
+ elementFormDefault="qualified"
targetNamespace="http://schemas.xmlsoap.org/ws/2004/09/mex">
<xsd:include schemaLocation="WS-MetadataExchange-2004_09.xsd"/>
</xsd:schema>
@@ -57,16 +62,22 @@
</wsdl:message>
<wsdl:portType name="SimpleResourcePortType">
<wsdl:operation name="FirstOperation">
- <wsdl:input name="FirstOperationRequest" message="tns:FirstOperationRequest" />
- <wsdl:output name="FirstOperationResponse" message="tns:FirstOperationResponse" />
+ <wsdl:input wsa:Action="http://ws.apache.org/muse/test/simple/first/FirstOperation"
+ name="FirstOperationRequest" message="tns:FirstOperationRequest" />
+ <wsdl:output wsa:Action="http://ws.apache.org/muse/test/simple/first/FirstOperationResponse"
+ name="FirstOperationResponse" message="tns:FirstOperationResponse" />
</wsdl:operation>
<wsdl:operation name="SecondOperation">
- <wsdl:input name="SecondOperationRequest" message="tns:SecondOperationRequest" />
- <wsdl:output name="SecondOperationResponse" message="tns:SecondOperationResponse" />
+ <wsdl:input wsa:Action="http://ws.apache.org/muse/test/simple/second/SecondOperation"
+ name="SecondOperationRequest" message="tns:SecondOperationRequest" />
+ <wsdl:output wsa:Action="http://ws.apache.org/muse/test/simple/second/SecondOperationResponse"
+ name="SecondOperationResponse" message="tns:SecondOperationResponse" />
</wsdl:operation>
<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:portType>
<wsdl:binding name="SimpleResourceBinding" type="tns:SimpleResourcePortType">
Modified: webservices/muse/trunk/samples/wsrf/src/org/apache/muse/test/wsrf/WsrfTestClient.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/samples/wsrf/src/org/apache/muse/test/wsrf/WsrfTestClient.java?rev=421771&r1=421770&r2=421771&view=diff
==============================================================================
--- webservices/muse/trunk/samples/wsrf/src/org/apache/muse/test/wsrf/WsrfTestClient.java (original)
+++ webservices/muse/trunk/samples/wsrf/src/org/apache/muse/test/wsrf/WsrfTestClient.java Thu Jul 13 17:38:54 2006
@@ -50,7 +50,7 @@
{
ResourceIdFactory factory = new CounterResourceIdFactory();
QName name = factory.getIdentifierName();
- URI value = factory.getNextIdentifier();
+ String value = factory.getNextIdentifier();
epr.addParameter(name, value);
}
@@ -111,7 +111,7 @@
public static void queryResourceProperties(WsResourceClient client)
throws Exception
{
- String query = "/*/wsrf-rl:CurrentTime";
+ String query = "/*/*";
String dialect = XPathUtils.NAMESPACE_URI;
client.queryResourceProperties(query, dialect);
}
@@ -145,7 +145,8 @@
//
// change these to point to different applications/servers
//
- String contextPath = "/wsrf/services/WsResource";
+ String webAppRoot = "/test-wsrf/services";
+ String contextPath = webAppRoot + "/WsResource";
int port = 8080;
//
@@ -165,8 +166,8 @@
//
// test WSRL operations
//
- // destroy(client);
- // setTerminationTime(client);
+ //destroy(client);
+ //setTerminationTime(client);
//
// test WSRP read operations
@@ -185,16 +186,13 @@
//
setResourceProperties(client);
- //
- // test WSRMD document
- //
client.getRMD();
//
// test WSSG directory
//
- contextPath = "/test-wsrf/services/ServiceGroup";
+ contextPath = webAppRoot + "/ServiceGroup";
address = getLocalAddress(contextPath, port);
epr = new EndpointReference(address);
Modified: webservices/muse/trunk/samples/wsrf/wsdl/WS-ResourceMetadataDescriptor-CD-01.wsdl
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/samples/wsrf/wsdl/WS-ResourceMetadataDescriptor-CD-01.wsdl?rev=421771&r1=421770&r2=421771&view=diff
==============================================================================
--- webservices/muse/trunk/samples/wsrf/wsdl/WS-ResourceMetadataDescriptor-CD-01.wsdl (original)
+++ webservices/muse/trunk/samples/wsrf/wsdl/WS-ResourceMetadataDescriptor-CD-01.wsdl Thu Jul 13 17:38:54 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/samples/wsrf/wsdl/WS-ServiceGroup-1_2.wsdl
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/samples/wsrf/wsdl/WS-ServiceGroup-1_2.wsdl?rev=421771&r1=421770&r2=421771&view=diff
==============================================================================
--- webservices/muse/trunk/samples/wsrf/wsdl/WS-ServiceGroup-1_2.wsdl (original)
+++ webservices/muse/trunk/samples/wsrf/wsdl/WS-ServiceGroup-1_2.wsdl Thu Jul 13 17:38:54 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"/>
Modified: webservices/muse/trunk/samples/wsrf/wsdl/WS-ServiceGroupEntry-1_2.wsdl
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/samples/wsrf/wsdl/WS-ServiceGroupEntry-1_2.wsdl?rev=421771&r1=421770&r2=421771&view=diff
==============================================================================
--- webservices/muse/trunk/samples/wsrf/wsdl/WS-ServiceGroupEntry-1_2.wsdl (original)
+++ webservices/muse/trunk/samples/wsrf/wsdl/WS-ServiceGroupEntry-1_2.wsdl Thu Jul 13 17:38:54 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" />
Modified: webservices/muse/trunk/samples/wsrf/wsdl/WsResource.wsdl
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/samples/wsrf/wsdl/WsResource.wsdl?rev=421771&r1=421770&r2=421771&view=diff
==============================================================================
--- webservices/muse/trunk/samples/wsrf/wsdl/WsResource.wsdl (original)
+++ webservices/muse/trunk/samples/wsrf/wsdl/WsResource.wsdl Thu Jul 13 17:38:54 2006
@@ -3,7 +3,7 @@
targetNamespace="http://ws.apache.org/muse/test/wsrf"
xmlns:tns="http://ws.apache.org/muse/test/wsrf"
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"
@@ -17,6 +17,11 @@
<wsdl:types>
<xsd:schema
elementFormDefault="qualified"
+ targetNamespace="http://www.w3.org/2005/08/addressing">
+ <xsd:include schemaLocation="WS-Addressing-2005_08.xsd"/>
+ </xsd:schema>
+ <xsd:schema
+ elementFormDefault="qualified"
targetNamespace="http://schemas.xmlsoap.org/ws/2004/09/mex">
<xsd:include schemaLocation="WS-MetadataExchange-2004_09.xsd"/>
</xsd:schema>
@@ -147,50 +152,62 @@
wsrf-rp:ResourceProperties="tns:WsResourceProperties"
wsrmd:Descriptor="WsResourceMetadata"
wsrmd:DescriptorLocation="WsResource.rmd" >
- <!--
<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="Destroy">
- <wsdl:input name="DestroyRequest" message="tns:DestroyRequest" />
- <wsdl:output name="DestroyResponse" message="tns:DestroyResponse" />
+ <wsdl:input wsa:Action="http://docs.oasis-open.org/wsrf/rlw-2/ImmediateResourceTermination/DestroyRequest"
+ name="DestroyRequest" message="tns:DestroyRequest" />
+ <wsdl:output wsa:Action="http://docs.oasis-open.org/wsrf/rlw-2/ImmediateResourceTermination/DestroyResponse"
+ name="DestroyResponse" message="tns:DestroyResponse" />
<wsdl:fault name="ResourceNotDestroyedFault" message="tns:ResourceNotDestroyedFault" />
<wsdl:fault name="ResourceUnknownFault" message="tns:ResourceUnknownFault" />
<wsdl:fault name="ResourceUnavailableFault" message="tns:ResourceUnavailableFault"/>
</wsdl:operation>
<wsdl:operation name="SetTerminationTime">
- <wsdl:input name="SetTerminationTimeRequest" message="tns:SetTerminationTimeRequest" />
- <wsdl:output name="SetTerminationTimeResponse" message="tns:SetTerminationTimeResponse" />
+ <wsdl:input wsa:Action="http://docs.oasis-open.org/wsrf/rlw-2/ScheduledResourceTermination/SetTerminationTimeRequest"
+ name="SetTerminationTimeRequest" message="tns:SetTerminationTimeRequest" />
+ <wsdl:output wsa:Action="http://docs.oasis-open.org/wsrf/rlw-2/ScheduledResourceTermination/SetTerminationTimeResponse"
+ name="SetTerminationTimeResponse" message="tns:SetTerminationTimeResponse" />
<wsdl:fault name="UnableToSetTerminationTimeFault" message="tns:UnableToSetTerminationTimeFault" />
<wsdl:fault name="ResourceUnknownFault" message="tns:ResourceUnknownFault" />
<wsdl:fault name="ResourceUnavailableFault" message="tns:ResourceUnavailableFault"/>
<wsdl:fault name="TerminationTimeChangeRejectedFault" message="tns:TerminationTimeChangeRejectedFault" />
</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"/>
@@ -198,8 +215,10 @@
<wsdl:fault name="QueryEvaluationErrorFault" message="tns:QueryEvaluationErrorFault" />
</wsdl:operation>
<wsdl:operation name="SetResourceProperties">
- <wsdl:input name="SetResourcePropertiesRequest" message="tns:SetResourcePropertiesRequest" />
- <wsdl:output name="SetResourcePropertiesResponse" message="tns:SetResourcePropertiesResponse" />
+ <wsdl:input wsa:Action="http://docs.oasis-open.org/wsrf/rpw-2/SetResourceProperties/SetResourcePropertiesRequest"
+ name="SetResourcePropertiesRequest" message="tns:SetResourcePropertiesRequest" />
+ <wsdl:output wsa:Action="http://docs.oasis-open.org/wsrf/rpw-2/SetResourceProperties/SetResourcePropertiesResponse"
+ name="SetResourcePropertiesResponse" message="tns:SetResourcePropertiesResponse" />
<wsdl:fault name="ResourceUnknownFault" message="tns:ResourceUnknownFault"/>
<wsdl:fault name="ResourceUnavailableFault" message="tns:ResourceUnavailableFault"/>
<wsdl:fault name="InvalidModificationFault" message="tns:InvalidModificationFault" />
@@ -440,6 +459,7 @@
name="SetResourcePropertyRequestFailedFault"/>
</wsdl:fault>
</wsdl:operation>
+ <wsdl:operation name="GetMetadata"><wsdl-soap:operation soapAction="http://ws.apache.org/muse/test/wsrf/GetMetadata"/><wsdl:input name="GetMetadataMsg"><wsdl-soap:body use="encoded"/></wsdl:input><wsdl:output name="GetMetadataResponseMsg"><wsdl-soap:body use="encoded"/></wsdl:output></wsdl:operation>
</wsdl:binding>
<wsdl:service name="WsResourceService">
<wsdl:port name="WsResourcePort" binding="tns:WsResourceBinding">
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org