Author: ryman
Date: Wed May 31 13:12:30 2006
New Revision: 410656
URL: http://svn.apache.org/viewvc?rev=410656&view=rev
Log:
added HTTP extension output to Ant task and regenerated W3C test results
Modified:
incubator/woden/java/ant-test/test-suite-results.zip
incubator/woden/java/ant-test/test.xml
incubator/woden/java/src/org/apache/woden/ant/WsdlCm.java
Modified: incubator/woden/java/ant-test/test-suite-results.zip
URL:
http://svn.apache.org/viewvc/incubator/woden/java/ant-test/test-suite-results.zip?rev=410656&r1=410655&r2=410656&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/woden/java/ant-test/test.xml
URL:
http://svn.apache.org/viewvc/incubator/woden/java/ant-test/test.xml?rev=410656&r1=410655&r2=410656&view=diff
==============================================================================
--- incubator/woden/java/ant-test/test.xml (original)
+++ incubator/woden/java/ant-test/test.xml Wed May 31 13:12:30 2006
@@ -5,381 +5,569 @@
xmlns:cmhttp='http://www.w3.org/2002/ws/desc/wsdl/component-http'
xmlns:cmrpc='http://www.w3.org/2002/ws/desc/wsdl/component-rpc'
xmlns:cmsoap='http://www.w3.org/2002/ws/desc/wsdl/component-soap'
-xml:id='id-1236687821'>
+xml:id='id-1095695961'>
<interfaces>
- <interfaceComponent xml:id='id-565926862'>
+ <interfaceComponent xml:id='id-1247313496'>
<name>
- <cmbase:namespaceName>http://example.org/Service</cmbase:namespaceName>
- <cmbase:localName>EchoInterface</cmbase:localName>
+
<cmbase:namespaceName>http://www.w3.org/2005/08/sparql-protocol-query/#</cmbase:namespaceName>
+ <cmbase:localName>SparqlQuery</cmbase:localName>
</name>
+ <interfaceFaults>
+ <interfaceFaultComponent xml:id='id-880098905'>
+ <name>
+
<cmbase:namespaceName>http://www.w3.org/2005/08/sparql-protocol-query/#</cmbase:namespaceName>
+ <cmbase:localName>MalformedQuery</cmbase:localName>
+ </name>
+ <parent ref='id-1247313496'/>
+ </interfaceFaultComponent>
+ <interfaceFaultComponent xml:id='id-1109196376'>
+ <name>
+
<cmbase:namespaceName>http://www.w3.org/2005/08/sparql-protocol-query/#</cmbase:namespaceName>
+ <cmbase:localName>QueryRequestRefused</cmbase:localName>
+ </name>
+ <parent ref='id-1247313496'/>
+ </interfaceFaultComponent>
+ </interfaceFaults>
<interfaceOperations>
- <interfaceOperationComponent xml:id='id-607427534'>
+ <interfaceOperationComponent xml:id='id-1127333464'>
<name>
-
<cmbase:namespaceName>http://example.org/Service</cmbase:namespaceName>
- <cmbase:localName>Echo</cmbase:localName>
+
<cmbase:namespaceName>http://www.w3.org/2005/08/sparql-protocol-query/#</cmbase:namespaceName>
+ <cmbase:localName>query</cmbase:localName>
</name>
<messageExchangePattern>http://www.w3.org/2006/01/wsdl/in-out</messageExchangePattern>
<interfaceMessageReferences>
- <interfaceMessageReferenceComponent xml:id='id-635362254'>
+ <interfaceMessageReferenceComponent xml:id='id-1300086360'>
<messageLabel>In</messageLabel>
<direction>in</direction>
<messageContentModel>#element</messageContentModel>
- <elementDeclaration ref='id-337664973'/>
- <parent ref='id-607427534'/>
+ <parent ref='id-1127333464'/>
</interfaceMessageReferenceComponent>
- <interfaceMessageReferenceComponent xml:id='id-951409614'>
+ <interfaceMessageReferenceComponent xml:id='id-1323269720'>
<messageLabel>Out</messageLabel>
<direction>out</direction>
<messageContentModel>#element</messageContentModel>
- <elementDeclaration ref='id-337664973'/>
- <parent ref='id-607427534'/>
+ <parent ref='id-1127333464'/>
</interfaceMessageReferenceComponent>
</interfaceMessageReferences>
- <parent ref='id-565926862'/>
+ <interfaceFaultReferences>
+ <interfaceFaultReferenceComponent xml:id='id-1159085656'>
+ <interfaceFault ref='id-880098905'/>
+ <messageLabel>Out</messageLabel>
+ <direction>out</direction>
+ <parent ref='id-1127333464'/>
+ </interfaceFaultReferenceComponent>
+ <interfaceFaultReferenceComponent xml:id='id-1170619992'>
+ <interfaceFault ref='id-1109196376'/>
+ <messageLabel>Out</messageLabel>
+ <direction>out</direction>
+ <parent ref='id-1127333464'/>
+ </interfaceFaultReferenceComponent>
+ </interfaceFaultReferences>
+ <parent ref='id-1247313496'/>
</interfaceOperationComponent>
</interfaceOperations>
</interfaceComponent>
</interfaces>
<bindings>
- <bindingComponent xml:id='id-965204942'>
+ <bindingComponent xml:id='id-1191034456'>
<name>
- <cmbase:namespaceName>http://example.org/Service</cmbase:namespaceName>
- <cmbase:localName>EchoSOAPBinding</cmbase:localName>
+
<cmbase:namespaceName>http://www.w3.org/2005/08/sparql-protocol-query/#</cmbase:namespaceName>
+ <cmbase:localName>queryHttpGet</cmbase:localName>
</name>
+ <interface ref='id-1247313496'/>
+ <type>http://www.w3.org/2006/01/wsdl/http</type>
+ <bindingFaults>
+ <bindingFaultComponent xml:id='id-1075740248'>
+ <interfaceFault ref='id-880098905'/>
+ <parent ref='id-1191034456'/>
+ <cmhttp:httpErrorStatusCode>
+ <cmhttp:code>400</cmhttp:code>
+ </cmhttp:httpErrorStatusCode>
+ </bindingFaultComponent>
+ <bindingFaultComponent xml:id='id-1088126552'>
+ <interfaceFault ref='id-1109196376'/>
+ <parent ref='id-1191034456'/>
+ <cmhttp:httpErrorStatusCode>
+ <cmhttp:code>500</cmhttp:code>
+ </cmhttp:httpErrorStatusCode>
+ </bindingFaultComponent>
+ </bindingFaults>
+ <bindingOperations>
+ <bindingOperationComponent xml:id='id-1099693656'>
+ <interfaceOperation ref='id-1127333464'/>
+ <parent ref='id-1191034456'/>
+ </bindingOperationComponent>
+ </bindingOperations>
+ <cmhttp:httpCookies>false</cmhttp:httpCookies>
+
<cmhttp:httpQueryParameterSeparatorDefault>&</cmhttp:httpQueryParameterSeparatorDefault>
+ </bindingComponent>
+ <bindingComponent xml:id='id-1482227288'>
+ <name>
+
<cmbase:namespaceName>http://www.w3.org/2005/08/sparql-protocol-query/#</cmbase:namespaceName>
+ <cmbase:localName>queryHttpPost</cmbase:localName>
+ </name>
+ <interface ref='id-1247313496'/>
+ <type>http://www.w3.org/2006/01/wsdl/http</type>
+ <bindingFaults>
+ <bindingFaultComponent xml:id='id-1478426200'>
+ <interfaceFault ref='id-880098905'/>
+ <parent ref='id-1482227288'/>
+ <cmhttp:httpErrorStatusCode>
+ <cmhttp:code>400</cmhttp:code>
+ </cmhttp:httpErrorStatusCode>
+ </bindingFaultComponent>
+ <bindingFaultComponent xml:id='id-1489026648'>
+ <interfaceFault ref='id-1109196376'/>
+ <parent ref='id-1482227288'/>
+ <cmhttp:httpErrorStatusCode>
+ <cmhttp:code>500</cmhttp:code>
+ </cmhttp:httpErrorStatusCode>
+ </bindingFaultComponent>
+ </bindingFaults>
+ <bindingOperations>
+ <bindingOperationComponent xml:id='id-1492319832'>
+ <interfaceOperation ref='id-1127333464'/>
+ <parent ref='id-1482227288'/>
+ </bindingOperationComponent>
+ </bindingOperations>
+ <cmhttp:httpCookies>false</cmhttp:httpCookies>
+
<cmhttp:httpQueryParameterSeparatorDefault>&</cmhttp:httpQueryParameterSeparatorDefault>
+ </bindingComponent>
+ <bindingComponent xml:id='id-1488191064'>
+ <name>
+
<cmbase:namespaceName>http://www.w3.org/2005/08/sparql-protocol-query/#</cmbase:namespaceName>
+ <cmbase:localName>querySoap</cmbase:localName>
+ </name>
+ <interface ref='id-1247313496'/>
<type>http://www.w3.org/2006/01/wsdl/soap</type>
+ <bindingFaults>
+ <bindingFaultComponent xml:id='id-1493991000'>
+ <interfaceFault ref='id-880098905'/>
+ <parent ref='id-1488191064'/>
+ <cmsoap:soapFaultCode>
+ <cmsoap:code>
+
<cmbase:namespaceName>http://www.w3.org/2003/05/soap-envelope</cmbase:namespaceName>
+ <cmbase:localName>Sender</cmbase:localName>
+ </cmsoap:code>
+ </cmsoap:soapFaultCode>
+ <cmsoap:soapFaultSubcodes>
+ </cmsoap:soapFaultSubcodes>
+ </bindingFaultComponent>
+ <bindingFaultComponent xml:id='id-1506213464'>
+ <interfaceFault ref='id-1109196376'/>
+ <parent ref='id-1488191064'/>
+ <cmsoap:soapFaultCode>
+ <cmsoap:code>
+
<cmbase:namespaceName>http://www.w3.org/2003/05/soap-envelope</cmbase:namespaceName>
+ <cmbase:localName>Sender</cmbase:localName>
+ </cmsoap:code>
+ </cmsoap:soapFaultCode>
+ <cmsoap:soapFaultSubcodes>
+ </cmsoap:soapFaultSubcodes>
+ </bindingFaultComponent>
+ </bindingFaults>
+ <bindingOperations>
+ <bindingOperationComponent xml:id='id-1508769368'>
+ <interfaceOperation ref='id-1127333464'/>
+ <parent ref='id-1488191064'/>
+
<cmsoap:soapMep>http://www.w3.org/2003/05/soap/mep/request-response</cmsoap:soapMep>
+ </bindingOperationComponent>
+ </bindingOperations>
+ <cmsoap:soapVersion>1.2</cmsoap:soapVersion>
</bindingComponent>
</bindings>
- <services>
- <serviceComponent xml:id='id-988355534'>
+ <elementDeclarations>
+ <elementDeclarationComponent xml:id='id-809762394'>
<name>
- <cmbase:namespaceName>http://example.org/Service</cmbase:namespaceName>
- <cmbase:localName>EchoService</cmbase:localName>
+
<cmbase:namespaceName>http://www.w3.org/2005/sparql-results#</cmbase:namespaceName>
+ <cmbase:localName>binding</cmbase:localName>
</name>
- <interface ref='id-565926862'/>
- <endpoints>
- <endpointComponent xml:id='id-1016011726'>
- <name>SOAPEndpoint</name>
- <binding ref='id-965204942'/>
- <parent ref='id-988355534'/>
- </endpointComponent>
- </endpoints>
- </serviceComponent>
- </services>
- <elementDeclarations>
- <elementDeclarationComponent xml:id='id-337664973'>
+ <system>http://www.w3.org/2001/XMLSchema</system>
+ </elementDeclarationComponent>
+ <elementDeclarationComponent xml:id='id-937082458'>
+ <name>
+
<cmbase:namespaceName>http://www.w3.org/2005/sparql-results#</cmbase:namespaceName>
+ <cmbase:localName>bnode</cmbase:localName>
+ </name>
+ <system>http://www.w3.org/2001/XMLSchema</system>
+ </elementDeclarationComponent>
+ <elementDeclarationComponent xml:id='id-936492634'>
<name>
- <cmbase:namespaceName>http://example.org/Service</cmbase:namespaceName>
- <cmbase:localName>myElement</cmbase:localName>
+
<cmbase:namespaceName>http://www.w3.org/2005/sparql-results#</cmbase:namespaceName>
+ <cmbase:localName>boolean</cmbase:localName>
+ </name>
+ <system>http://www.w3.org/2001/XMLSchema</system>
+ </elementDeclarationComponent>
+ <elementDeclarationComponent xml:id='id-936885850'>
+ <name>
+
<cmbase:namespaceName>http://www.w3.org/2005/sparql-results#</cmbase:namespaceName>
+ <cmbase:localName>head</cmbase:localName>
+ </name>
+ <system>http://www.w3.org/2001/XMLSchema</system>
+ </elementDeclarationComponent>
+ <elementDeclarationComponent xml:id='id-936427098'>
+ <name>
+
<cmbase:namespaceName>http://www.w3.org/2005/sparql-results#</cmbase:namespaceName>
+ <cmbase:localName>link</cmbase:localName>
+ </name>
+ <system>http://www.w3.org/2001/XMLSchema</system>
+ </elementDeclarationComponent>
+ <elementDeclarationComponent xml:id='id-936754778'>
+ <name>
+
<cmbase:namespaceName>http://www.w3.org/2005/sparql-results#</cmbase:namespaceName>
+ <cmbase:localName>literal</cmbase:localName>
+ </name>
+ <system>http://www.w3.org/2001/XMLSchema</system>
+ </elementDeclarationComponent>
+ <elementDeclarationComponent xml:id='id-936820314'>
+ <name>
+
<cmbase:namespaceName>http://www.w3.org/2005/sparql-results#</cmbase:namespaceName>
+ <cmbase:localName>result</cmbase:localName>
+ </name>
+ <system>http://www.w3.org/2001/XMLSchema</system>
+ </elementDeclarationComponent>
+ <elementDeclarationComponent xml:id='id-936689242'>
+ <name>
+
<cmbase:namespaceName>http://www.w3.org/2005/sparql-results#</cmbase:namespaceName>
+ <cmbase:localName>results</cmbase:localName>
+ </name>
+ <system>http://www.w3.org/2001/XMLSchema</system>
+ </elementDeclarationComponent>
+ <elementDeclarationComponent xml:id='id-937147994'>
+ <name>
+
<cmbase:namespaceName>http://www.w3.org/2005/sparql-results#</cmbase:namespaceName>
+ <cmbase:localName>sparql</cmbase:localName>
+ </name>
+ <system>http://www.w3.org/2001/XMLSchema</system>
+ </elementDeclarationComponent>
+ <elementDeclarationComponent xml:id='id-937016922'>
+ <name>
+
<cmbase:namespaceName>http://www.w3.org/2005/sparql-results#</cmbase:namespaceName>
+ <cmbase:localName>uri</cmbase:localName>
+ </name>
+ <system>http://www.w3.org/2001/XMLSchema</system>
+ </elementDeclarationComponent>
+ <elementDeclarationComponent xml:id='id-936558170'>
+ <name>
+
<cmbase:namespaceName>http://www.w3.org/2005/sparql-results#</cmbase:namespaceName>
+ <cmbase:localName>variable</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</elementDeclarationComponent>
</elementDeclarations>
<typeDefinitions>
- <typeDefinitionComponent xml:id='id-320101325'>
+ <typeDefinitionComponent xml:id='id-894041690'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>ENTITIES</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-322624461'>
+ <typeDefinitionComponent xml:id='id-883654234'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>ENTITY</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-326228941'>
+ <typeDefinitionComponent xml:id='id-881491546'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>ID</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-326294477'>
+ <typeDefinitionComponent xml:id='id-872676954'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>IDREF</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-325901261'>
+ <typeDefinitionComponent xml:id='id-872545882'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>IDREFS</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-323640269'>
+ <typeDefinitionComponent xml:id='id-873528922'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>NCName</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-323312589'>
+ <typeDefinitionComponent xml:id='id-873987674'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>NMTOKEN</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-321706957'>
+ <typeDefinitionComponent xml:id='id-884047450'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>NMTOKENS</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-322952141'>
+ <typeDefinitionComponent xml:id='id-882933338'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>NOTATION</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-325245901'>
+ <typeDefinitionComponent xml:id='id-873725530'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>Name</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-326818765'>
+ <typeDefinitionComponent xml:id='id-881294938'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>QName</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-322755533'>
+ <typeDefinitionComponent xml:id='id-897203802'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>anyURI</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-321969101'>
+ <typeDefinitionComponent xml:id='id-883785306'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>base64Binary</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-324852685'>
+ <typeDefinitionComponent xml:id='id-873594458'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>boolean</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-327015373'>
+ <typeDefinitionComponent xml:id='id-889093722'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>byte</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-326556621'>
+ <typeDefinitionComponent xml:id='id-881557082'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>date</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-320822221'>
+ <typeDefinitionComponent xml:id='id-893451866'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>dateTime</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-321444813'>
+ <typeDefinitionComponent xml:id='id-884997722'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>decimal</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-331537357'>
+ <typeDefinitionComponent xml:id='id-896810586'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>double</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-322558925'>
+ <typeDefinitionComponent xml:id='id-883326554'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>duration</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-319019981'>
+ <typeDefinitionComponent xml:id='id-888700506'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>float</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-325704653'>
+ <typeDefinitionComponent xml:id='id-872873562'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>gDay</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-322165709'>
+ <typeDefinitionComponent xml:id='id-883719770'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>gMonth</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-320363469'>
+ <typeDefinitionComponent xml:id='id-893779546'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>gMonthDay</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-324918221'>
+ <typeDefinitionComponent xml:id='id-873659994'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>gYear</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-325114829'>
+ <typeDefinitionComponent xml:id='id-873332314'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>gYearMonth</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-322821069'>
+ <typeDefinitionComponent xml:id='id-897269338'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>hexBinary</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-326360013'>
+ <typeDefinitionComponent xml:id='id-881360474'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>int</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-322984909'>
+ <typeDefinitionComponent xml:id='id-874184282'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>integer</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-320494541'>
+ <typeDefinitionComponent xml:id='id-894172762'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>language</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-323443661'>
+ <typeDefinitionComponent xml:id='id-873856602'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>long</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-323050445'>
+ <typeDefinitionComponent xml:id='id-874249818'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>negativeInteger</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-322493389'>
+ <typeDefinitionComponent xml:id='id-883261018'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>nonNegativeInteger</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-319839181'>
+ <typeDefinitionComponent xml:id='id-894303834'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>nonPositiveInteger</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-320166861'>
+ <typeDefinitionComponent xml:id='id-894107226'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>normalizedString</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-327080909'>
+ <typeDefinitionComponent xml:id='id-881032794'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>positiveInteger</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-323378125'>
+ <typeDefinitionComponent xml:id='id-873791066'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>short</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-322689997'>
+ <typeDefinitionComponent xml:id='id-883195482'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>string</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-326622157'>
+ <typeDefinitionComponent xml:id='id-881098330'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>time</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-321084365'>
+ <typeDefinitionComponent xml:id='id-884801114'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>token</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-319282125'>
+ <typeDefinitionComponent xml:id='id-894991962'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>unsignedByte</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-326032333'>
+ <typeDefinitionComponent xml:id='id-872939098'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>unsignedInt</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-326425549'>
+ <typeDefinitionComponent xml:id='id-881163866'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>unsignedLong</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-325639117'>
+ <typeDefinitionComponent xml:id='id-872808026'>
<name>
<cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
<cmbase:localName>unsignedShort</cmbase:localName>
+ </name>
+ <system>http://www.w3.org/2001/XMLSchema</system>
+ </typeDefinitionComponent>
+ <typeDefinitionComponent xml:id='id-916962906'>
+ <name>
+
<cmbase:namespaceName>http://www.w3.org/2005/sparql-results#</cmbase:namespaceName>
+ <cmbase:localName>URI-reference</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
Modified: incubator/woden/java/src/org/apache/woden/ant/WsdlCm.java
URL:
http://svn.apache.org/viewvc/incubator/woden/java/src/org/apache/woden/ant/WsdlCm.java?rev=410656&r1=410655&r2=410656&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/ant/WsdlCm.java (original)
+++ incubator/woden/java/src/org/apache/woden/ant/WsdlCm.java Wed May 31
13:12:30 2006
@@ -28,8 +28,7 @@
*
* @author [EMAIL PROTECTED], aka [EMAIL PROTECTED]
*
- * TODO: test wsdlx:safe extension TODO: test wrpc:signature extension TODO:
- * test wsoap extension TODO: test whttp extension
+ * TODO: test whttp extension
*/
import java.io.File;
@@ -67,6 +66,12 @@
import org.apache.woden.wsdl20.TypeDefinition;
import org.apache.woden.wsdl20.extensions.ComponentExtensions;
import org.apache.woden.wsdl20.extensions.InterfaceOperationExtensions;
+import org.apache.woden.wsdl20.extensions.http.HTTPBindingExtensions;
+import org.apache.woden.wsdl20.extensions.http.HTTPBindingFaultExtensions;
+import
org.apache.woden.wsdl20.extensions.http.HTTPBindingMessageReferenceExtensions;
+import org.apache.woden.wsdl20.extensions.http.HTTPBindingOperationExtensions;
+import org.apache.woden.wsdl20.extensions.http.HTTPErrorStatusCode;
+import org.apache.woden.wsdl20.extensions.http.HTTPHeader;
import org.apache.woden.wsdl20.extensions.rpc.Argument;
import org.apache.woden.wsdl20.extensions.rpc.RPCInterfaceOperationExtensions;
import org.apache.woden.wsdl20.extensions.soap.SOAPBindingExtensions;
@@ -170,7 +175,46 @@
private void element(String tag, String content) {
indent();
- out.println("<" + tag + ">" + content + "</" + tag + ">");
+ out.println("<" + tag + ">" + escape(content) + "</" + tag +
">");
+ }
+
+ private static String escape(String x) {
+
+ if (x == null)
+ return null;
+
+ StringBuffer y = new StringBuffer();
+
+ for (int i = 0; i < x.length(); i++) {
+
+ char c = x.charAt(i);
+ switch (c) {
+ case '&':
+ y.append("&");
+ break;
+
+ case '<':
+ y.append("<");
+ break;
+
+ case '>':
+ y.append(">");
+ break;
+
+ case '"':
+ y.append(""");
+ break;
+
+ case '\'':
+ y.append("'");
+ break;
+
+ default:
+ y.append(c);
+ }
+ }
+
+ return y.toString();
}
private void emptyElement(String tag, String attributes) {
@@ -343,7 +387,8 @@
beginElement("interfaceFaultComponent", idAttribute(component));
write("name", component.getName());
- writeOptionalRef("elementDeclaration",
component.getElementDeclaration());
+ writeOptionalRef("elementDeclaration", component
+ .getElementDeclaration());
write("features", component.getFeatures());
write("properties", component.getProperties());
writeRef("parent", component.getParent());
@@ -462,7 +507,8 @@
write("messageLabel", component.getMessageLabel().toString());
write("direction", component.getDirection().toString());
write("messageContentModel",
component.getMessageContentModel());
- writeOptionalRef("elementDeclaration",
component.getElementDeclaration());
+ writeOptionalRef("elementDeclaration", component
+ .getElementDeclaration());
write("features", component.getFeatures());
write("properties", component.getProperties());
writeRef("parent", component.getParent());
@@ -571,6 +617,24 @@
// minOccurs="0" />
//
+ HTTPBindingExtensions http = (HTTPBindingExtensions) component
+
.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP);
+
+ if (http != null) {
+
+ write(WSDLCMHTTP_PREFIX + ":httpCookies",
http.isHttpCookies());
+
+ write(WSDLCMHTTP_PREFIX + ":httpMethodDefault", http
+ .getHttpMethodDefault());
+
+ write(WSDLCMHTTP_PREFIX +
":httpQueryParameterSeparatorDefault",
+
http.getHttpQueryParameterSeparatorDefault());
+
+ write(WSDLCMHTTP_PREFIX + ":httpTransferCodingDefault",
http
+ .getHttpTransferCodingDefault());
+
+ }
+
// <!-- SOAP Binding Extension -->
SOAPBindingExtensions soap = (SOAPBindingExtensions) component
@@ -618,12 +682,16 @@
private void write(String tag, SOAPModule component) {
+ beginElement(tag, idAttribute(component));
+
write(WSDLCMSOAP_PREFIX + ":ref", component.getRef());
write(WSDLCMSOAP_PREFIX + ":required", component.isRequired()
.booleanValue());
writeRef(WSDLCMSOAP_PREFIX + ":parent", component.getParent());
+
+ endElement();
}
private void write(String tag, BindingFault[] components) {
@@ -677,6 +745,20 @@
// minOccurs="0" />
//
+ HTTPBindingFaultExtensions http = (HTTPBindingFaultExtensions)
component
+
.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP);
+
+ if (http != null) {
+
+ write(WSDLCMHTTP_PREFIX + ":httpErrorStatusCode", http
+ .getHttpErrorStatusCode());
+
+ write(WSDLCMHTTP_PREFIX + ":httpHeaders",
http.getHttpHeaders());
+
+ write(WSDLCMHTTP_PREFIX + ":httpTransferCoding", http
+ .getHttpTransferCoding());
+ }
+
// <!-- SOAP Binding Extension -->
SOAPBindingFaultExtensions soap = (SOAPBindingFaultExtensions)
component
@@ -697,6 +779,82 @@
endElement();
}
+ private void write(String tag, HTTPErrorStatusCode httpErrorStatusCode)
{
+
+ if (httpErrorStatusCode == null)
+ return;
+
+ // <xs:complexType name="HttpErrorStatusCodeType">
+ // <xs:annotation>
+ // <xs:documentation>
+ // Empty content represents #any.
+ // </xs:documentation>
+ // </xs:annotation>
+ // <xs:sequence>
+ // <xs:element name="code" type="xs:int" minOccurs="0"/>
+ // </xs:sequence>
+ // </xs:complexType>
+
+ beginElement(tag);
+
+ if (httpErrorStatusCode.isCodeUsed()) {
+
+ write(WSDLCMHTTP_PREFIX + ":code",
httpErrorStatusCode.toString());
+ }
+ endElement();
+ }
+
+ private void write(String tag, HTTPHeader[] components) {
+
+ if (components.length == 0)
+ return;
+
+ Arrays.sort(components, new Comparator() {
+
+ public int compare(Object o1, Object o2) {
+
+ String n1 = ((HTTPHeader) o1).getName();
+ String n2 = ((HTTPHeader) o2).getName();
+
+ return n1.compareTo(n2);
+ }
+ });
+
+ beginElement(tag);
+
+ for (int i = 0; i < components.length; i++)
+ write(WSDLCMHTTP_PREFIX + ":HttpHeaderComponent",
components[i]);
+
+ endElement();
+ }
+
+ private void write(String tag, HTTPHeader component) {
+
+ // <xs:complexContent>
+ // <xs:restriction base="cmbase:Component">
+ // <xs:sequence>
+ // <xs:element name="name" type="xs:string" />
+ // <xs:element name="typeDefinition" type="cmbase:Ref" />
+ // <xs:element name="required" type="xs:boolean" />
+ // <xs:element name="parent" type="cmbase:Ref" />
+ // </xs:sequence>
+ // </xs:restriction>
+ // </xs:complexContent>
+
+ beginElement(tag, idAttribute(component));
+
+ write(WSDLCMHTTP_PREFIX + ":name", component.getName());
+
+ writeRef(WSDLCMHTTP_PREFIX + ":typeDefinition", component
+ .getTypeDefinition());
+
+ write(WSDLCMHTTP_PREFIX + ":required", component.isRequired());
+
+ writeRef(WSDLCMHTTP_PREFIX + ":parent", component.getParent());
+
+ endElement();
+ }
+
private void write(String tag, SOAPFaultSubcodes soapFaultSubcodes) {
beginElement(tag);
@@ -759,6 +917,8 @@
private void write(String tag, SOAPHeaderBlock component) {
+ beginElement(tag, idAttribute(component));
+
writeRef(WSDLCMSOAP_PREFIX + ":elementDeclaration", component
.getElementDeclaration());
@@ -770,6 +930,8 @@
writeRef(WSDLCMSOAP_PREFIX + ":parent", component.getParent());
+ endElement();
+
}
private void write(String tag, BindingOperation[] components) {
@@ -825,6 +987,34 @@
// minOccurs="0" />
//
+ HTTPBindingOperationExtensions http =
(HTTPBindingOperationExtensions) component
+
.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP);
+
+ if (http != null) {
+
+ write(WSDLCMHTTP_PREFIX + ":httpFaultSerialization",
http
+ .getHttpFaultSerialization());
+
+ write(WSDLCMHTTP_PREFIX + ":httpInputSerialization",
http
+ .getHttpInputSerialization());
+
+ write(WSDLCMHTTP_PREFIX + ":httpLocation",
http.getHttpLocation());
+
+ // TODO: write(WSDLCMHTTP_PREFIX +
":httpLocationIgnoreUncited",
+ // http.isHttpLocationIgnoreUncite());
+
+ write(WSDLCMHTTP_PREFIX + ":httpMethod",
http.getHttpMethod());
+
+ write(WSDLCMHTTP_PREFIX + ":httpOutputSerialization",
http
+ .getHttpOutputSerialization());
+
+ write(WSDLCMHTTP_PREFIX +
":httpQueryParameterSeparator", http
+ .getHttpQueryParameterSeparator());
+
+ write(WSDLCMHTTP_PREFIX + ":httpTransferCodingDefault",
http
+ .getHttpTransferCodingDefault());
+ }
+
// <!-- SOAP Binding Extension -->
SOAPBindingOperationExtensions soap =
(SOAPBindingOperationExtensions) component
@@ -883,7 +1073,17 @@
// <xs:element ref="cmhttp:httpHeaders" minOccurs="0" />
// <xs:element ref="cmhttp:httpTransferCoding"
// minOccurs="0" />
- //
+
+ HTTPBindingMessageReferenceExtensions http =
(HTTPBindingMessageReferenceExtensions) component
+
.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP);
+
+ if (http != null) {
+
+ write(WSDLCMHTTP_PREFIX + ":httpHeaders",
http.getHttpHeaders());
+
+ write(WSDLCMHTTP_PREFIX + ":httpTransferCoding", http
+ .getHttpTransferCoding());
+ }
// <!-- SOAP Binding Extension -->
@@ -1200,6 +1400,14 @@
element(tag, content);
}
+ private void write(String tag, Boolean o) {
+
+ if (o == null)
+ return;
+
+ write(tag, o.booleanValue());
+ }
+
private void write(String tag, boolean value) {
element(tag, value ? "true" : "false");
@@ -1234,13 +1442,13 @@
// TODO: write element content correctly
element(tag, o.toString());
}
-
+
private void writeOptionalRef(String tag, Object o) {
-
- if (o != null) {
-
- writeRef(tag, o);
- }
+
+ if (o == null)
+ return;
+
+ writeRef(tag, o);
}
private void writeRef(String tag, Object o) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
