- From: Jonathan Marsh via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 16 Jan 2007 12:53:57 +0000
- To: public-ws-desc-eds@w3.org
Update of /sources/public/2002/ws/desc/test-suite/documents/good/LocationTemplate-1G
In directory hutz:/tmp/cvs-serv6742/test-suite/documents/good/LocationTemplate-1G
Modified Files:
SOAPservice.wsdl TestMetadata.xml
Log Message:
See http://lists.w3.org/Archives/Public/www-ws-desc/2007Jan/0122.html:
In order not to lose the few bindings that make sense under SOAP, I’ve cloned LocationTemplate-1G into LocationTemplate-2G which is an HTTP binding-only version. I twiddled a few other details to keep everything sufficiently unique (e.g. service name, whttp:location URLs, etc.)
I’ve cut the AutoRemainder, AdditionalQueryParams, and AutoQueryParams bindings from LocationTemplate-1G.
Since we’ve clarified that the {http location} is engaged on both soap-request and request-response MEPs, I cloned the remaining 4 operations and test them on the request-response MEP as well.
While doing this, I noticed some service names were not unique within the whole set of tests we’re doing, which is inconvenient for some implementations like Axis2. I updated MessageTest-2G,3G,4G service names (which should affect the component model more than the message tests.)
Also made sure queryParameterSeparater values were consistent with any query params explicitly specified in whttp:location.
Index: TestMetadata.xml
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/documents/good/LocationTemplate-1G/TestMetadata.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** TestMetadata.xml 1 Dec 2006 23:44:23 -0000 1.2
--- TestMetadata.xml 16 Jan 2007 12:53:55 -0000 1.3
***************
*** 6,10 ****
<Title>Good Document LocationTemplate-1G</Title>
<Purpose>For testing interoperability</Purpose>
! <Description>Exercise wsoap:header.</Description>
<Status>accepted</Status>
<SpecRef></SpecRef>
--- 6,10 ----
<Title>Good Document LocationTemplate-1G</Title>
<Purpose>For testing interoperability</Purpose>
! <Description>Exercise whttp:location under the SOAP binding</Description>
<Status>accepted</Status>
<SpecRef></SpecRef>
Index: SOAPservice.wsdl
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/documents/good/LocationTemplate-1G/SOAPservice.wsdl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** SOAPservice.wsdl 2 Jan 2007 18:53:50 -0000 1.4
--- SOAPservice.wsdl 16 Jan 2007 12:53:55 -0000 1.5
***************
*** 54,58 ****
<binding name="MixedPathsQueryParams" interface="tns:ProbeSpace"
type="http://www.w3.org/2006/01/wsdl/soap" wsoap:version="1.2"
! wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP/">
<documentation> This binding tests the that parameters can be successfully inserted as path segments.
Expect: http://example.org/datespace/2006/11.html?day=18;start=16%3A40%3A00;end=20%3A00%3A42
--- 54,59 ----
<binding name="MixedPathsQueryParams" interface="tns:ProbeSpace"
type="http://www.w3.org/2006/01/wsdl/soap" wsoap:version="1.2"
! wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP/"
! whttp:queryParameterSeparaterDefault=";">
<documentation> This binding tests the that parameters can be successfully inserted as path segments.
Expect: http://example.org/datespace/2006/11.html?day=18;start=16%3A40%3A00;end=20%3A00%3A42
***************
*** 62,106 ****
</binding>
! <binding name="AutoQueryParams" interface="tns:ProbeSpace"
type="http://www.w3.org/2006/01/wsdl/soap" wsoap:version="1.2"
wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP/">
! <documentation> This binding tests the that parameters are automatically appended as query parameters.
! Expect: http://example.org/datespace.html?year=2006;month=11;day=18;time=16%3A40%3A00;time=20%3A00%3A42
</documentation>
<operation ref="tns:constructReference" wsoap:mep="http://www.w3.org/2003/05/soap/mep/soap-response/"
! whttp:location="datespace.html" whttp:queryParameterSeparator=";"/>
</binding>
!
! <binding name="AutoRemainder" interface="tns:ProbeSpace"
type="http://www.w3.org/2006/01/wsdl/soap" wsoap:version="1.2"
wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP/">
! <documentation> This binding tests the that parameters can be successfully inserted as path segments, with remaining ones becoming query parameters.
! Expect: http://example.org/datespace/2006/11.html?day=18&time=16%3A40%3A00&time=20%3A00%3A42
</documentation>
<operation ref="tns:constructReference" wsoap:mep="http://www.w3.org/2003/05/soap/mep/soap-response/"
! whttp:location="datespace/{year}/{month}.html"/>
</binding>
! <binding name="IgnoreUncited" interface="tns:ProbeSpace"
type="http://www.w3.org/2006/01/wsdl/soap" wsoap:version="1.2"
wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP/">
! <documentation> This binding tests the that parameters can be suppressed.
! Expect: http://example.org/datespace/2006.html?start=16%3A40%3A00
</documentation>
! <operation ref="tns:constructReference" wsoap:mep="http://www.w3.org/2003/05/soap/mep/soap-response/"
! whttp:location="datespace/{year}.html?start={time}" whttp:ignoreUncited="true"/>
</binding>
!
! <binding name="AdditionalQueryParams" interface="tns:ProbeSpace"
type="http://www.w3.org/2006/01/wsdl/soap" wsoap:version="1.2"
wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP/">
! <documentation> This binding tests that the parameters can be suppressed.
! Expect: http://example.org/datespace/2006.html?timezone=utc&month=11&day=18&time=16%3A40%3A00&time=20%3A00%3A42
</documentation>
! <operation ref="tns:constructReference" wsoap:mep="http://www.w3.org/2003/05/soap/mep/soap-response/"
! whttp:location="datespace/{year}.html?timezone=utc"/>
</binding>
! <binding name="Escaping" interface="tns:ProbeSpace"
type="http://www.w3.org/2006/01/wsdl/soap" wsoap:version="1.2"
wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP/">
--- 63,118 ----
</binding>
! <binding name="IgnoreUncited" interface="tns:ProbeSpace"
type="http://www.w3.org/2006/01/wsdl/soap" wsoap:version="1.2"
wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP/">
! <documentation> This binding tests the that parameters can be suppressed.
! Expect: http://example.org/datespace/2006.html?start=16%3A40%3A00
</documentation>
<operation ref="tns:constructReference" wsoap:mep="http://www.w3.org/2003/05/soap/mep/soap-response/"
! whttp:location="datespace/{year}.html?start={time}"/>
</binding>
!
! <binding name="Escaping" interface="tns:ProbeSpace"
type="http://www.w3.org/2006/01/wsdl/soap" wsoap:version="1.2"
wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP/">
! <documentation> This binding tests that escaping of curly braces is done correctly.
! Expect: http://example.org/datespace/2006.html?passphrase=%7B4(%23^$@!%7D4^@*%23%7D
</documentation>
<operation ref="tns:constructReference" wsoap:mep="http://www.w3.org/2003/05/soap/mep/soap-response/"
! whttp:location="datespace/{year}.html?passphrase={{4(^$@!}}4^@*}}"/>
</binding>
! <binding name="Paths2" interface="tns:ProbeSpace"
type="http://www.w3.org/2006/01/wsdl/soap" wsoap:version="1.2"
wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP/">
! <documentation> This binding tests the that parameters can be successfully inserted as path segments.
! Expect: http://example.org/datespace/2006/11/18/16%3A40%3A00-20%3A00%3A42.html
</documentation>
! <operation ref="tns:constructReference"
! whttp:location="datespacepost/{year}/{month}/{day}/{time}-{time}.html"/>
</binding>
!
! <binding name="MixedPathsQueryParams2" interface="tns:ProbeSpace"
! type="http://www.w3.org/2006/01/wsdl/soap" wsoap:version="1.2"
! wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP/"
! whttp:queryParameterSeparaterDefault=";">
! <documentation> This binding tests the that parameters can be successfully inserted as path segments.
! Expect: http://example.org/datespace/2006/11.html?day=18;start=16%3A40%3A00;end=20%3A00%3A42
! </documentation>
! <operation ref="tns:constructReference"
! whttp:location="datespacepost/{year}/{month}.html?day={day};start={time};end={time}"/>
! </binding>
!
! <binding name="IgnoreUncited2" interface="tns:ProbeSpace"
type="http://www.w3.org/2006/01/wsdl/soap" wsoap:version="1.2"
wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP/">
! <documentation> This binding tests the that parameters can be suppressed.
! Expect: http://example.org/datespace/2006.html?start=16%3A40%3A00
</documentation>
! <operation ref="tns:constructReference"
! whttp:location="datespacepost/{year}.html?start={time}"/>
</binding>
! <binding name="Escaping2" interface="tns:ProbeSpace"
type="http://www.w3.org/2006/01/wsdl/soap" wsoap:version="1.2"
wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP/">
***************
*** 108,124 ****
Expect: http://example.org/datespace/2006.html?passphrase=%7B4(%23^$@!%7D4^@*%23%7D
</documentation>
! <operation ref="tns:constructReference" wsoap:mep="http://www.w3.org/2003/05/soap/mep/soap-response/"
! whttp:location="datespace/{year}.html?passphrase={{4(^$@!}}4^@*}}" whttp:ignoreUncited="true"/>
</binding>
!
! <service name="ProbeSpaceService" interface="tns:ProbeSpace">
<documentation>Exercise each endpoint in order.</documentation>
<endpoint name="PathsEndpoint" binding="tns:Paths" address="http://example.org/"/>
<endpoint name="MixedPathsQueryParamsEndpoint" binding="tns:MixedPathsQueryParams" address="http://example.org/"/>
! <endpoint name="AutoQueryParamsEndpoint" binding="tns:AutoQueryParams" address="http://example.org/"/>
! <endpoint name="AutoRemainderEndpoint" binding="tns:AutoRemainder" address="http://example.org/"/>
! <endpoint name="IgnoreUncidedEndpoint" binding="tns:IgnoreUncited" address="http://example.org/"/>
! <endpoint name="AdditionalQueryParamsEndpoint" binding="tns:AdditionalQueryParams" address="http://example.org/"/>
<endpoint name="EscapingEndpoint" binding="tns:Escaping" address="http://example.org/"/>
</service>
</description>
--- 120,137 ----
Expect: http://example.org/datespace/2006.html?passphrase=%7B4(%23^$@!%7D4^@*%23%7D
</documentation>
! <operation ref="tns:constructReference"
! whttp:location="datespacepost/{year}.html?passphrase={{4(^$@!}}4^@*}}"/>
</binding>
!
! <service name="LocationTemplate1GService" interface="tns:ProbeSpace">
<documentation>Exercise each endpoint in order.</documentation>
<endpoint name="PathsEndpoint" binding="tns:Paths" address="http://example.org/"/>
<endpoint name="MixedPathsQueryParamsEndpoint" binding="tns:MixedPathsQueryParams" address="http://example.org/"/>
! <endpoint name="IgnoreUncitedEndpoint" binding="tns:IgnoreUncited" address="http://example.org/"/>
<endpoint name="EscapingEndpoint" binding="tns:Escaping" address="http://example.org/"/>
+ <endpoint name="Paths2Endpoint" binding="tns:Paths2" address="http://example.org/"/>
+ <endpoint name="MixedPathsQueryParams2Endpoint" binding="tns:MixedPathsQueryParams2" address="http://example.org/"/>
+ <endpoint name="IgnoreUncited2Endpoint" binding="tns:IgnoreUncited2" address="http://example.org/"/>
+ <endpoint name="Escaping2Endpoint" binding="tns:Escaping2" address="http://example.org/"/>
</service>
</description>
Received on Tuesday, 16 January 2007 12:54:53 UTC