- From: Jonathan Marsh via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 16 Jan 2007 14:40:38 +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-serv22469/test-suite/documents/good/LocationTemplate-1G
Modified Files:
SOAPservice.wsdl
Log Message:
Back out previous change, except for:
Giving the services used for message tests unique service names
Making sure query parameter separator is consistent with explicit params
Index: SOAPservice.wsdl
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/documents/good/LocationTemplate-1G/SOAPservice.wsdl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** SOAPservice.wsdl 16 Jan 2007 12:53:55 -0000 1.5
--- SOAPservice.wsdl 16 Jan 2007 14:40:36 -0000 1.6
***************
*** 35,39 ****
<operation name="constructReference" pattern="http://www.w3.org/2006/01/wsdl/in-out" style="http://www.w3.org/2006/01/wsdl/style/iri">
<documentation>Simple probe service - pass in a query structure, get a uri constructed from that structure back.
- Expect: http://example.org?year=2006&month=11&day=18&time=16:40:00&time=20:00:42
</documentation>
<input element="ds:dateSpace"/>
--- 35,38 ----
***************
*** 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/">
--- 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/">
***************
*** 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>
--- 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>
Received on Tuesday, 16 January 2007 14:41:15 UTC