You are viewing a plain text version of this content. The canonical link for it is here.
Posted to woden-dev@ws.apache.org by ry...@apache.org on 2006/06/01 05:26:55 UTC
svn commit: r410729 - in /incubator/woden/java: ant-test/
src/org/apache/woden/internal/util/
src/org/apache/woden/internal/wsdl20/extensions/
src/org/apache/woden/internal/wsdl20/extensions/http/
src/org/apache/woden/internal/xml/ src/org/apache/woden...
Author: ryman
Date: Wed May 31 20:26:54 2006
New Revision: 410729
URL: http://svn.apache.org/viewvc?rev=410729&view=rev
Log:
[WODEN-23] Fixed HTTP Binding Extension and regenerated W3C test results.
Added:
incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPEndpointExtensionsImpl.java
incubator/woden/java/src/org/apache/woden/internal/xml/HTTPAuthenicationSchemeAttrImpl.java
incubator/woden/java/src/org/apache/woden/wsdl20/extensions/http/HTTPAuthenticationScheme.java
incubator/woden/java/src/org/apache/woden/wsdl20/extensions/http/HTTPEndpointExtensions.java
incubator/woden/java/src/org/apache/woden/xml/HTTPAuthenticationSchemeAttr.java
Modified:
incubator/woden/java/ant-test/test-suite-results.zip
incubator/woden/java/ant-test/test.xml
incubator/woden/java/src/org/apache/woden/internal/util/ComponentModelBuilder.java
incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/PopulatedExtensionRegistry.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=410729&r1=410728&r2=410729&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=410729&r1=410728&r2=410729&view=diff
==============================================================================
--- incubator/woden/java/ant-test/test.xml (original)
+++ incubator/woden/java/ant-test/test.xml Wed May 31 20:26:54 2006
@@ -5,569 +5,406 @@
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-1089656949'>
+xml:id='id-1574465461'>
<interfaces>
- <interfaceComponent xml:id='id-1268308084'>
+ <interfaceComponent xml:id='id-1984982966'>
<name>
- <cmbase:namespaceName>http://www.w3.org/2005/08/sparql-protocol-query/#</cmbase:namespaceName>
- <cmbase:localName>SparqlQuery</cmbase:localName>
+ <cmbase:namespaceName>http://example.org/Echo</cmbase:namespaceName>
+ <cmbase:localName>EchoInterface</cmbase:localName>
</name>
- <interfaceFaults>
- <interfaceFaultComponent xml:id='id-1136040052'>
- <name>
- <cmbase:namespaceName>http://www.w3.org/2005/08/sparql-protocol-query/#</cmbase:namespaceName>
- <cmbase:localName>MalformedQuery</cmbase:localName>
- </name>
- <parent ref='id-1268308084'/>
- </interfaceFaultComponent>
- <interfaceFaultComponent xml:id='id-1281218676'>
- <name>
- <cmbase:namespaceName>http://www.w3.org/2005/08/sparql-protocol-query/#</cmbase:namespaceName>
- <cmbase:localName>QueryRequestRefused</cmbase:localName>
- </name>
- <parent ref='id-1268308084'/>
- </interfaceFaultComponent>
- </interfaceFaults>
<interfaceOperations>
- <interfaceOperationComponent xml:id='id-1299322996'>
+ <interfaceOperationComponent xml:id='id-1963503542'>
<name>
- <cmbase:namespaceName>http://www.w3.org/2005/08/sparql-protocol-query/#</cmbase:namespaceName>
- <cmbase:localName>query</cmbase:localName>
+ <cmbase:namespaceName>http://example.org/Echo</cmbase:namespaceName>
+ <cmbase:localName>echo</cmbase:localName>
</name>
<messageExchangePattern>http://www.w3.org/2006/01/wsdl/in-out</messageExchangePattern>
<interfaceMessageReferences>
- <interfaceMessageReferenceComponent xml:id='id-1321080948'>
+ <interfaceMessageReferenceComponent xml:id='id-135802806'>
<messageLabel>In</messageLabel>
<direction>in</direction>
<messageContentModel>#element</messageContentModel>
- <parent ref='id-1299322996'/>
+ <elementDeclaration ref='id-458534838'/>
+ <parent ref='id-1963503542'/>
</interfaceMessageReferenceComponent>
- <interfaceMessageReferenceComponent xml:id='id-1176033396'>
+ <interfaceMessageReferenceComponent xml:id='id-233861046'>
<messageLabel>Out</messageLabel>
<direction>out</direction>
<messageContentModel>#element</messageContentModel>
- <parent ref='id-1299322996'/>
+ <elementDeclaration ref='id-459239350'/>
+ <parent ref='id-1963503542'/>
</interfaceMessageReferenceComponent>
</interfaceMessageReferences>
- <interfaceFaultReferences>
- <interfaceFaultReferenceComponent xml:id='id-1200412788'>
- <interfaceFault ref='id-1136040052'/>
- <messageLabel>Out</messageLabel>
- <direction>out</direction>
- <parent ref='id-1299322996'/>
- </interfaceFaultReferenceComponent>
- <interfaceFaultReferenceComponent xml:id='id-1203558516'>
- <interfaceFault ref='id-1281218676'/>
- <messageLabel>Out</messageLabel>
- <direction>out</direction>
- <parent ref='id-1299322996'/>
- </interfaceFaultReferenceComponent>
- </interfaceFaultReferences>
- <parent ref='id-1268308084'/>
+ <parent ref='id-1984982966'/>
+ <cmextensions:safety>true</cmextensions:safety>
</interfaceOperationComponent>
</interfaceOperations>
</interfaceComponent>
</interfaces>
<bindings>
- <bindingComponent xml:id='id-1098602612'>
- <name>
- <cmbase:namespaceName>http://www.w3.org/2005/08/sparql-protocol-query/#</cmbase:namespaceName>
- <cmbase:localName>queryHttpGet</cmbase:localName>
- </name>
- <interface ref='id-1268308084'/>
- <type>http://www.w3.org/2006/01/wsdl/http</type>
- <bindingFaults>
- <bindingFaultComponent xml:id='id-1117034612'>
- <interfaceFault ref='id-1136040052'/>
- <parent ref='id-1098602612'/>
- <cmhttp:httpErrorStatusCode>
- <cmhttp:code>400</cmhttp:code>
- </cmhttp:httpErrorStatusCode>
- </bindingFaultComponent>
- <bindingFaultComponent xml:id='id-1498486900'>
- <interfaceFault ref='id-1281218676'/>
- <parent ref='id-1098602612'/>
- <cmhttp:httpErrorStatusCode>
- <cmhttp:code>500</cmhttp:code>
- </cmhttp:httpErrorStatusCode>
- </bindingFaultComponent>
- </bindingFaults>
- <bindingOperations>
- <bindingOperationComponent xml:id='id-1510119540'>
- <interfaceOperation ref='id-1299322996'/>
- <parent ref='id-1098602612'/>
- </bindingOperationComponent>
- </bindingOperations>
- <cmhttp:httpCookies>false</cmhttp:httpCookies>
- <cmhttp:httpQueryParameterSeparatorDefault>&</cmhttp:httpQueryParameterSeparatorDefault>
- </bindingComponent>
- <bindingComponent xml:id='id-1523996788'>
+ <bindingComponent xml:id='id-233041846'>
<name>
- <cmbase:namespaceName>http://www.w3.org/2005/08/sparql-protocol-query/#</cmbase:namespaceName>
- <cmbase:localName>queryHttpPost</cmbase:localName>
+ <cmbase:namespaceName>http://example.org/Echo</cmbase:namespaceName>
+ <cmbase:localName>EchoHTTPBinding</cmbase:localName>
</name>
- <interface ref='id-1268308084'/>
+ <interface ref='id-1984982966'/>
<type>http://www.w3.org/2006/01/wsdl/http</type>
- <bindingFaults>
- <bindingFaultComponent xml:id='id-1519671412'>
- <interfaceFault ref='id-1136040052'/>
- <parent ref='id-1523996788'/>
- <cmhttp:httpErrorStatusCode>
- <cmhttp:code>400</cmhttp:code>
- </cmhttp:httpErrorStatusCode>
- </bindingFaultComponent>
- <bindingFaultComponent xml:id='id-1522505844'>
- <interfaceFault ref='id-1281218676'/>
- <parent ref='id-1523996788'/>
- <cmhttp:httpErrorStatusCode>
- <cmhttp:code>500</cmhttp:code>
- </cmhttp:httpErrorStatusCode>
- </bindingFaultComponent>
- </bindingFaults>
<bindingOperations>
- <bindingOperationComponent xml:id='id-1533565044'>
- <interfaceOperation ref='id-1299322996'/>
- <parent ref='id-1523996788'/>
+ <bindingOperationComponent xml:id='id-62238646'>
+ <interfaceOperation ref='id-1963503542'/>
+ <parent ref='id-233041846'/>
+ <cmhttp:httpFaultSerialization>application/xml</cmhttp:httpFaultSerialization>
+ <cmhttp:httpInputSerialization>application/x-www-form-urlencoded</cmhttp:httpInputSerialization>
+ <cmhttp:httpLocationIgnoreUncited>false</cmhttp:httpLocationIgnoreUncited>
+ <cmhttp:httpMethod>GET</cmhttp:httpMethod>
+ <cmhttp:httpOutputSerialization>application/xml</cmhttp:httpOutputSerialization>
+ <cmhttp:httpQueryParameterSeparator>&</cmhttp:httpQueryParameterSeparator>
</bindingOperationComponent>
</bindingOperations>
<cmhttp:httpCookies>false</cmhttp:httpCookies>
<cmhttp:httpQueryParameterSeparatorDefault>&</cmhttp:httpQueryParameterSeparatorDefault>
</bindingComponent>
- <bindingComponent xml:id='id-1529436276'>
- <name>
- <cmbase:namespaceName>http://www.w3.org/2005/08/sparql-protocol-query/#</cmbase:namespaceName>
- <cmbase:localName>querySoap</cmbase:localName>
- </name>
- <interface ref='id-1268308084'/>
- <type>http://www.w3.org/2006/01/wsdl/soap</type>
- <bindingFaults>
- <bindingFaultComponent xml:id='id-1535826036'>
- <interfaceFault ref='id-1136040052'/>
- <parent ref='id-1529436276'/>
- <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-1539070068'>
- <interfaceFault ref='id-1281218676'/>
- <parent ref='id-1529436276'/>
- <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-1147885684'>
- <interfaceOperation ref='id-1299322996'/>
- <parent ref='id-1529436276'/>
- <cmsoap:soapMep>http://www.w3.org/2003/05/soap/mep/request-response</cmsoap:soapMep>
- </bindingOperationComponent>
- </bindingOperations>
- <cmsoap:soapVersion>1.2</cmsoap:soapVersion>
- </bindingComponent>
</bindings>
- <elementDeclarations>
- <elementDeclarationComponent xml:id='id-1355896950'>
- <name>
- <cmbase:namespaceName>http://www.w3.org/2005/sparql-results#</cmbase:namespaceName>
- <cmbase:localName>binding</cmbase:localName>
- </name>
- <system>http://www.w3.org/2001/XMLSchema</system>
- </elementDeclarationComponent>
- <elementDeclarationComponent xml:id='id-1343101046'>
- <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-1342511222'>
+ <services>
+ <serviceComponent xml:id='id-48820150'>
<name>
- <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-1342904438'>
- <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-1342445686'>
- <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-1342773366'>
- <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-1342838902'>
- <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-1342707830'>
- <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-1343166582'>
- <name>
- <cmbase:namespaceName>http://www.w3.org/2005/sparql-results#</cmbase:namespaceName>
- <cmbase:localName>sparql</cmbase:localName>
+ <cmbase:namespaceName>http://example.org/Echo</cmbase:namespaceName>
+ <cmbase:localName>EchoService</cmbase:localName>
</name>
- <system>http://www.w3.org/2001/XMLSchema</system>
- </elementDeclarationComponent>
- <elementDeclarationComponent xml:id='id-1343035510'>
+ <interface ref='id-1984982966'/>
+ <endpoints>
+ <endpointComponent xml:id='id-32386998'>
+ <name>EchoHTTPEndpoint</name>
+ <binding ref='id-233041846'/>
+ <parent ref='id-48820150'/>
+ <cmhttp:httpAuthenticationRealm>example.org Realm</cmhttp:httpAuthenticationRealm>
+ <cmhttp:httpAuthenticationScheme>basic</cmhttp:httpAuthenticationScheme>
+ </endpointComponent>
+ </endpoints>
+ </serviceComponent>
+ </services>
+ <elementDeclarations>
+ <elementDeclarationComponent xml:id='id-458534838'>
<name>
- <cmbase:namespaceName>http://www.w3.org/2005/sparql-results#</cmbase:namespaceName>
- <cmbase:localName>uri</cmbase:localName>
+ <cmbase:namespaceName>http://example.org/Echo</cmbase:namespaceName>
+ <cmbase:localName>Echo</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</elementDeclarationComponent>
- <elementDeclarationComponent xml:id='id-1342576758'>
+ <elementDeclarationComponent xml:id='id-459239350'>
<name>
- <cmbase:namespaceName>http://www.w3.org/2005/sparql-results#</cmbase:namespaceName>
- <cmbase:localName>variable</cmbase:localName>
+ <cmbase:namespaceName>http://example.org/Echo</cmbase:namespaceName>
+ <cmbase:localName>EchoResponse</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</elementDeclarationComponent>
</elementDeclarations>
<typeDefinitions>
- <typeDefinitionComponent xml:id='id-1444960374'>
+ <typeDefinitionComponent xml:id='id-294268854'>
<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-1459296374'>
+ <typeDefinitionComponent xml:id='id-296464310'>
<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-1436391542'>
+ <typeDefinitionComponent xml:id='id-297938870'>
<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-1436719222'>
+ <typeDefinitionComponent xml:id='id-298266550'>
<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-1436588150'>
+ <typeDefinitionComponent xml:id='id-298135478'>
<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-1434572918'>
+ <typeDefinitionComponent xml:id='id-291319734'>
<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-1434507382'>
+ <typeDefinitionComponent xml:id='id-291254198'>
<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-1443420278'>
+ <typeDefinitionComponent xml:id='id-296857526'>
<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-1458575478'>
+ <typeDefinitionComponent xml:id='id-295743414'>
<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-1441290358'>
+ <typeDefinitionComponent xml:id='id-290992054'>
<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-1436194934'>
+ <typeDefinitionComponent xml:id='id-289353654'>
<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-1458641014'>
+ <typeDefinitionComponent xml:id='id-295808950'>
<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-1459427446'>
+ <typeDefinitionComponent xml:id='id-296595382'>
<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-1434638454'>
+ <typeDefinitionComponent xml:id='id-291385270'>
<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-1435605110'>
+ <typeDefinitionComponent xml:id='id-300511158'>
<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-1436457078'>
+ <typeDefinitionComponent xml:id='id-298004406'>
<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-1444894838'>
+ <typeDefinitionComponent xml:id='id-293679030'>
<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-1444305014'>
+ <typeDefinitionComponent xml:id='id-301379510'>
<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-1458772086'>
+ <typeDefinitionComponent xml:id='id-295940022'>
<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-1458968694'>
+ <typeDefinitionComponent xml:id='id-296136630'>
<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-1435736182'>
+ <typeDefinitionComponent xml:id='id-300642230'>
<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-1440962678'>
+ <typeDefinitionComponent xml:id='id-298463158'>
<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-1459361910'>
+ <typeDefinitionComponent xml:id='id-296529846'>
<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-1444698230'>
+ <typeDefinitionComponent xml:id='id-294006710'>
<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-1441749110'>
+ <typeDefinitionComponent xml:id='id-291450806'>
<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-1441421430'>
+ <typeDefinitionComponent xml:id='id-291123126'>
<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-1458706550'>
+ <typeDefinitionComponent xml:id='id-295874486'>
<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-1436784758'>
+ <typeDefinitionComponent xml:id='id-297807798'>
<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-1438701686'>
+ <typeDefinitionComponent xml:id='id-291975094'>
<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-1445091446'>
+ <typeDefinitionComponent xml:id='id-293875638'>
<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-1434900598'>
+ <typeDefinitionComponent xml:id='id-291647414'>
<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-1434769526'>
+ <typeDefinitionComponent xml:id='id-291516342'>
<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-1458903158'>
+ <typeDefinitionComponent xml:id='id-296071094'>
<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-1445222518'>
+ <typeDefinitionComponent xml:id='id-299233206'>
<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-1445025910'>
+ <typeDefinitionComponent xml:id='id-294334390'>
<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-1435932790'>
+ <typeDefinitionComponent xml:id='id-300838838'>
<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-1434835062'>
+ <typeDefinitionComponent xml:id='id-291581878'>
<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-1458837622'>
+ <typeDefinitionComponent xml:id='id-296005558'>
<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-1436522614'>
+ <typeDefinitionComponent xml:id='id-289157046'>
<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-1444632694'>
+ <typeDefinitionComponent xml:id='id-301805494'>
<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-1446500470'>
+ <typeDefinitionComponent xml:id='id-300380086'>
<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-1436981366'>
+ <typeDefinitionComponent xml:id='id-298528694'>
<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-1436063862'>
+ <typeDefinitionComponent xml:id='id-289222582'>
<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-1440897142'>
+ <typeDefinitionComponent xml:id='id-298397622'>
<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-1454790774'>
- <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/internal/util/ComponentModelBuilder.java
URL: http://svn.apache.org/viewvc/incubator/woden/java/src/org/apache/woden/internal/util/ComponentModelBuilder.java?rev=410729&r1=410728&r2=410729&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/util/ComponentModelBuilder.java (original)
+++ incubator/woden/java/src/org/apache/woden/internal/util/ComponentModelBuilder.java Wed May 31 20:26:54 2006
@@ -32,8 +32,10 @@
import org.apache.woden.internal.wsdl20.Constants;
import org.apache.woden.internal.wsdl20.DescriptionImpl;
import org.apache.woden.internal.wsdl20.ElementDeclarationImpl;
+import org.apache.woden.internal.wsdl20.EndpointImpl;
import org.apache.woden.internal.wsdl20.InterfaceImpl;
import org.apache.woden.internal.wsdl20.InterfaceOperationImpl;
+import org.apache.woden.internal.wsdl20.ServiceImpl;
import org.apache.woden.internal.wsdl20.TypeDefinitionImpl;
import org.apache.woden.internal.wsdl20.TypesImpl;
import org.apache.woden.internal.wsdl20.extensions.ComponentExtensionsImpl;
@@ -42,6 +44,7 @@
import org.apache.woden.wsdl20.BindingFaultReference;
import org.apache.woden.wsdl20.BindingMessageReference;
import org.apache.woden.wsdl20.BindingOperation;
+import org.apache.woden.wsdl20.Endpoint;
import org.apache.woden.wsdl20.InterfaceOperation;
import org.apache.woden.wsdl20.extensions.ComponentExtensions;
import org.apache.woden.wsdl20.extensions.ExtensionRegistry;
@@ -52,10 +55,12 @@
import org.apache.woden.wsdl20.xml.BindingMessageReferenceElement;
import org.apache.woden.wsdl20.xml.BindingOperationElement;
import org.apache.woden.wsdl20.xml.DescriptionElement;
+import org.apache.woden.wsdl20.xml.EndpointElement;
import org.apache.woden.wsdl20.xml.ImportElement;
import org.apache.woden.wsdl20.xml.IncludeElement;
import org.apache.woden.wsdl20.xml.InterfaceElement;
import org.apache.woden.wsdl20.xml.InterfaceOperationElement;
+import org.apache.woden.wsdl20.xml.ServiceElement;
import org.apache.woden.wsdl20.xml.TypesElement;
import org.apache.woden.wsdl20.xml.WSDLElement;
import org.apache.ws.commons.schema.XmlSchema;
@@ -71,8 +76,8 @@
* class.
*
* @author John Kaputin (jkaputin@apache.org)
- * @author Arthur Ryman (ryman@ca.ibm.com) - added Interface Operation
- * extensions
+ * @author Arthur Ryman (ryman@ca.ibm.com, arthur.ryman@gmail.com) - added
+ * Interface Operation extensions, - added Endpoint extensions
*/
public class ComponentModelBuilder {
@@ -88,6 +93,8 @@
private List fBindingsDone = new Vector();
+ private List fServicesDone = new Vector();
+
public ComponentModelBuilder(DescriptionImpl desc) {
fDesc = desc;
// TODO fErrorRpt = errorRpt; see todo in buildElementDeclarations()
@@ -99,6 +106,7 @@
buildElementsAndTypes(desc);
buildInterfaces(desc);
buildBindings(desc);
+ buildServices(desc);
IncludeElement[] includes = desc.getIncludeElements();
for (int i = 0; i < includes.length; i++) {
@@ -259,8 +267,8 @@
.queryComponentExtensionNamespaces(InterfaceOperation.class);
/*
- * Create a ComponentExtensions object for each registered
- * extension namespace used with this binding operation.
+ * Create a ComponentExtensions object for each registered extension
+ * namespace used with this binding operation.
*/
for (int i = 0; i < extNamespaces.length; i++) {
URI extNS = extNamespaces[i];
@@ -269,9 +277,10 @@
InterfaceOperation.class, oper, extNS);
oper.setComponentExtensions(extNS, compExt);
}
- }
-
- // TODO: apply component model default rules if these extensions are absent in the XML infoset
+ }
+
+ // TODO: apply component model default rules if these extensions are
+ // absent in the XML infoset
}
/***************************************************************************
@@ -371,14 +380,11 @@
* been created, create one now to handle this default value.
*/
if (binding
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP) == null)
- {
+ .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP) == null) {
ComponentExtensions compExt = createComponentExtensions(
- Binding.class,
- binding,
- ComponentExtensions.URI_NS_SOAP);
- binding.setComponentExtensions(
- ComponentExtensions.URI_NS_SOAP, compExt);
+ Binding.class, binding, ComponentExtensions.URI_NS_SOAP);
+ binding.setComponentExtensions(ComponentExtensions.URI_NS_SOAP,
+ compExt);
}
SOAPBindingExtensions sbe = (SOAPBindingExtensions) binding
@@ -393,37 +399,32 @@
* not already been created, create one now to handle this
* default value.
*/
- if (binding
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP) == null)
- {
- ComponentExtensions compExt = createComponentExtensions(
- Binding.class,
- binding,
- ComponentExtensions.URI_NS_HTTP);
- binding.setComponentExtensions(
- ComponentExtensions.URI_NS_HTTP, compExt);
- }
- }
- }
-
- if (ComponentExtensions.URI_NS_HTTP.equals(binding.getType()))
- {
- /* If the binding type is HTTP, the Binding extension properties
- * {http query parameter separator default} and {http cookies} are REQUIRED
- * so if an HTTPBindingExtensions object has not already been created,
- * create one now to handle their default values.
- */
- if (binding
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP) == null)
- {
- ComponentExtensions compExt = createComponentExtensions(
- Binding.class,
- binding,
- ComponentExtensions.URI_NS_HTTP);
- binding.setComponentExtensions(
- ComponentExtensions.URI_NS_HTTP, compExt);
- }
- }
+ if (binding
+ .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP) == null) {
+ ComponentExtensions compExt = createComponentExtensions(
+ Binding.class, binding,
+ ComponentExtensions.URI_NS_HTTP);
+ binding.setComponentExtensions(
+ ComponentExtensions.URI_NS_HTTP, compExt);
+ }
+ }
+ }
+
+ if (ComponentExtensions.URI_NS_HTTP.equals(binding.getType())) {
+ /*
+ * If the binding type is HTTP, the Binding extension properties
+ * {http query parameter separator default} and {http cookies} are
+ * REQUIRED so if an HTTPBindingExtensions object has not already
+ * been created, create one now to handle their default values.
+ */
+ if (binding
+ .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP) == null) {
+ ComponentExtensions compExt = createComponentExtensions(
+ Binding.class, binding, ComponentExtensions.URI_NS_HTTP);
+ binding.setComponentExtensions(ComponentExtensions.URI_NS_HTTP,
+ compExt);
+ }
+ }
}
@@ -468,33 +469,32 @@
if (bindFault
.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP) == null) {
ComponentExtensions compExt = createComponentExtensions(
- BindingFault.class,
- bindFault,
+ BindingFault.class, bindFault,
ComponentExtensions.URI_NS_SOAP);
bindFault.setComponentExtensions(
ComponentExtensions.URI_NS_SOAP, compExt);
}
}
- if (ComponentExtensions.URI_NS_HTTP.equals(bindingType))
- {
- /* If the binding type is HTTP, the BindingFault extension property
- * {http error status code}, {http output serialization}, {http fault serialization}
- * and {http location ignore uncited} are REQUIRED so if an HTTPBindingFaultExtensions
- * object has not already been created, create one now to handle their default values.
- */
- if (bindFault
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP) == null)
- {
- ComponentExtensions compExt = createComponentExtensions(
- BindingFault.class,
- bindFault,
- ComponentExtensions.URI_NS_HTTP);
- bindFault.setComponentExtensions(
- ComponentExtensions.URI_NS_HTTP, compExt);
- }
- }
-
+ if (ComponentExtensions.URI_NS_HTTP.equals(bindingType)) {
+ /*
+ * If the binding type is HTTP, the BindingFault extension property
+ * {http error status code}, {http output serialization}, {http
+ * fault serialization} and {http location ignore uncited} are
+ * REQUIRED so if an HTTPBindingFaultExtensions object has not
+ * already been created, create one now to handle their default
+ * values.
+ */
+ if (bindFault
+ .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP) == null) {
+ ComponentExtensions compExt = createComponentExtensions(
+ BindingFault.class, bindFault,
+ ComponentExtensions.URI_NS_HTTP);
+ bindFault.setComponentExtensions(
+ ComponentExtensions.URI_NS_HTTP, compExt);
+ }
+ }
+
}
private void buildBindingOperationExtensions(BindingOperationImpl bindOper) {
@@ -528,23 +528,22 @@
*/
URI bindingType = ((BindingElement) bindOper.getParentElement())
.getType();
- if (ComponentExtensions.URI_NS_HTTP.equals(bindingType))
- {
- /* If the binding type is HTTP, the BindingOperation extension properties
- * {http input serialization}, {http output serialization},
- * {http fault serialization} and {http location ignore uncited} are REQUIRED
- * so if an HTTPBindingOperationExtensions object has not already been created,
- * create one now to handle their default values.
- */
+ if (ComponentExtensions.URI_NS_HTTP.equals(bindingType)) {
+ /*
+ * If the binding type is HTTP, the BindingOperation extension
+ * properties {http input serialization}, {http output
+ * serialization}, {http fault serialization} and {http location
+ * ignore uncited} are REQUIRED so if an
+ * HTTPBindingOperationExtensions object has not already been
+ * created, create one now to handle their default values.
+ */
if (bindOper
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP) == null)
- {
- ComponentExtensions compExt = createComponentExtensions(
- BindingOperation.class,
- bindOper,
- ComponentExtensions.URI_NS_HTTP);
- bindOper.setComponentExtensions(
- ComponentExtensions.URI_NS_HTTP, compExt);
+ .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP) == null) {
+ ComponentExtensions compExt = createComponentExtensions(
+ BindingOperation.class, bindOper,
+ ComponentExtensions.URI_NS_HTTP);
+ bindOper.setComponentExtensions(
+ ComponentExtensions.URI_NS_HTTP, compExt);
}
}
}
@@ -581,6 +580,49 @@
bindFaultRef.setComponentExtensions(extNS, compExt);
}
}
+ }
+
+ private void buildServices(DescriptionImpl desc) {
+
+ ServiceElement[] serviceEls = desc.getServiceElements();
+ for (int i = 0; i < serviceEls.length; i++) {
+ ServiceImpl serviceImpl = (ServiceImpl) serviceEls[i];
+ if (!fServicesDone.contains(serviceImpl)) {
+ buildEndpoints(serviceImpl);
+ fServicesDone.add(serviceImpl);
+ }
+ }
+ }
+
+ private void buildEndpoints(ServiceImpl serviceImpl) {
+
+ EndpointElement[] endpoints = serviceImpl.getEndpointElements();
+ for (int i = 0; i < endpoints.length; i++) {
+ EndpointImpl endpoint = (EndpointImpl) endpoints[i];
+ buildEndpointExtensions(endpoint);
+ }
+ }
+
+ private void buildEndpointExtensions(EndpointImpl endpoint) {
+
+ ExtensionRegistry er = fDesc.getExtensionRegistry();
+ URI[] extNamespaces = er
+ .queryComponentExtensionNamespaces(Endpoint.class);
+
+ /*
+ * Create a ComponentExtensions object for each registered
+ * extension namespace used with this endpoint.
+ */
+ for (int i = 0; i < extNamespaces.length; i++) {
+ URI extNS = extNamespaces[i];
+ if (endpoint.hasExtensionAttributesForNamespace(extNS)
+ || endpoint.hasExtensionElementsForNamespace(extNS)) {
+ ComponentExtensions compExt = createComponentExtensions(
+ Endpoint.class, endpoint, extNS);
+ endpoint.setComponentExtensions(extNS, compExt);
+ }
+ }
+
}
/*
Modified: incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/PopulatedExtensionRegistry.java
URL: http://svn.apache.org/viewvc/incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/PopulatedExtensionRegistry.java?rev=410729&r1=410728&r2=410729&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/PopulatedExtensionRegistry.java (original)
+++ incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/PopulatedExtensionRegistry.java Wed May 31 20:26:54 2006
@@ -17,7 +17,10 @@
import org.apache.woden.internal.wsdl20.extensions.http.HTTPBindingExtensionsImpl;
import org.apache.woden.internal.wsdl20.extensions.http.HTTPBindingFaultExtensionsImpl;
+import org.apache.woden.internal.wsdl20.extensions.http.HTTPBindingMessageReferenceExtensionsImpl;
+import org.apache.woden.internal.wsdl20.extensions.http.HTTPBindingOperationExtensionsImpl;
import org.apache.woden.internal.wsdl20.extensions.http.HTTPConstants;
+import org.apache.woden.internal.wsdl20.extensions.http.HTTPEndpointExtensionsImpl;
import org.apache.woden.internal.wsdl20.extensions.http.HTTPHeaderDeserializer;
import org.apache.woden.internal.wsdl20.extensions.http.HTTPHeaderImpl;
import org.apache.woden.internal.wsdl20.extensions.rpc.RPCConstants;
@@ -46,6 +49,7 @@
import org.apache.woden.wsdl20.BindingFaultReference;
import org.apache.woden.wsdl20.BindingMessageReference;
import org.apache.woden.wsdl20.BindingOperation;
+import org.apache.woden.wsdl20.Endpoint;
import org.apache.woden.wsdl20.InterfaceOperation;
import org.apache.woden.wsdl20.extensions.ComponentExtensions;
import org.apache.woden.wsdl20.extensions.ExtensionRegistry;
@@ -69,7 +73,7 @@
* @author John Kaputin (jkaputin@apache.org) - Woden changes
* @author Arthur Ryman (ryman@ca.ibm.com, arthur.ryman@gmail.com) - added
* wsdlx:safe and wrpc:signature to Interface Operation, - added
- * HTTPAuthenicationSchemeAttrImpl
+ * HTTPAuthenticationSchemeAttrImpl
*/
public class PopulatedExtensionRegistry extends ExtensionRegistry {
@@ -282,6 +286,18 @@
registerComponentExtension(BindingFault.class,
ComponentExtensions.URI_NS_HTTP,
HTTPBindingFaultExtensionsImpl.class);
+
+ registerComponentExtension(BindingOperation.class,
+ ComponentExtensions.URI_NS_HTTP,
+ HTTPBindingOperationExtensionsImpl.class);
+
+ registerComponentExtension(BindingMessageReference.class,
+ ComponentExtensions.URI_NS_HTTP,
+ HTTPBindingMessageReferenceExtensionsImpl.class);
+
+ registerComponentExtension(Endpoint.class,
+ ComponentExtensions.URI_NS_HTTP,
+ HTTPEndpointExtensionsImpl.class);
}
}
Added: incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPEndpointExtensionsImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPEndpointExtensionsImpl.java?rev=410729&view=auto
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPEndpointExtensionsImpl.java (added)
+++ incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPEndpointExtensionsImpl.java Wed May 31 20:26:54 2006
@@ -0,0 +1,62 @@
+/**
+ * Copyright 2006 Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.woden.internal.wsdl20.extensions.http;
+
+import org.apache.woden.internal.wsdl20.extensions.ComponentExtensionsImpl;
+import org.apache.woden.wsdl20.extensions.http.HTTPAuthenticationScheme;
+import org.apache.woden.wsdl20.extensions.http.HTTPEndpointExtensions;
+import org.apache.woden.wsdl20.xml.WSDLElement;
+import org.apache.woden.xml.HTTPAuthenticationSchemeAttr;
+import org.apache.woden.xml.StringAttr;
+
+/**
+ * This class defines the properties from the HTTP namespace added to the WSDL
+ * <code>Endpoint</code> component as part of the HTTP binding extension
+ * defined by the WSDL 2.0 spec.
+ *
+ * @author Arthur Ryman (ryman@ca.ibm.com, arthur.ryman@gmail.com)
+ *
+ */
+public class HTTPEndpointExtensionsImpl extends ComponentExtensionsImpl
+ implements HTTPEndpointExtensions {
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.woden.wsdl20.extensions.http.HTTPEndpointExtensions#getHttpAuthenicationScheme()
+ */
+ public HTTPAuthenticationScheme getHttpAuthenicationScheme() {
+
+ HTTPAuthenticationSchemeAttr scheme = (HTTPAuthenticationSchemeAttr) ((WSDLElement) fParent)
+ .getExtensionAttribute(HTTPConstants.Q_ATTR_AUTHENTICATION_TYPE);
+
+ return scheme != null ? scheme.getScheme() : null;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.woden.wsdl20.extensions.http.HTTPEndpointExtensions#getHttpAuthenticationRealm()
+ */
+ public String getHttpAuthenticationRealm() {
+
+ StringAttr realm = (StringAttr) ((WSDLElement) fParent)
+ .getExtensionAttribute(HTTPConstants.Q_ATTR_AUTHENTICATION_REALM);
+
+ return realm != null ? realm.getString() : null;
+ }
+
+}
Added: incubator/woden/java/src/org/apache/woden/internal/xml/HTTPAuthenicationSchemeAttrImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/java/src/org/apache/woden/internal/xml/HTTPAuthenicationSchemeAttrImpl.java?rev=410729&view=auto
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/xml/HTTPAuthenicationSchemeAttrImpl.java (added)
+++ incubator/woden/java/src/org/apache/woden/internal/xml/HTTPAuthenicationSchemeAttrImpl.java Wed May 31 20:26:54 2006
@@ -0,0 +1,85 @@
+/**
+ * Copyright 2006 Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.woden.internal.xml;
+
+import org.apache.woden.ErrorReporter;
+import org.apache.woden.WSDLException;
+import org.apache.woden.internal.ErrorLocatorImpl;
+import org.apache.woden.wsdl20.extensions.http.HTTPAuthenticationScheme;
+import org.apache.woden.xml.HTTPAuthenticationSchemeAttr;
+import org.w3c.dom.Element;
+
+/**
+ * This class implements the whttp:authenticationType attribute.
+ *
+ * @author Arthur Ryman (ryman@ca.ibm.com, arthur.ryman@gmail.com)
+ *
+ */
+public class HTTPAuthenicationSchemeAttrImpl extends XMLAttrImpl implements
+ HTTPAuthenticationSchemeAttr {
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.woden.internal.xml.XMLAttrImpl#convert(org.w3c.dom.Element,
+ * java.lang.String)
+ */
+ protected Object convert(Element ownerEl, String attrValue)
+ throws WSDLException {
+
+ // TODO: define correct error numbers
+
+ HTTPAuthenticationScheme scheme = null;
+
+ if (attrValue == null) {
+ setValid(false);
+ getErrorReporter().reportError(new ErrorLocatorImpl(), // TODO
+ // line&col
+ // nos.
+ "WSDL508", new Object[] { attrValue },
+ ErrorReporter.SEVERITY_ERROR);
+ } else if (attrValue.equals(HTTPAuthenticationScheme.BASIC.toString())) {
+
+ setValid(true);
+ scheme = HTTPAuthenticationScheme.BASIC;
+ } else if (attrValue.equals(HTTPAuthenticationScheme.DIGEST.toString())) {
+
+ setValid(true);
+ scheme = HTTPAuthenticationScheme.DIGEST;
+ } else {
+
+ setValid(false);
+ getErrorReporter().reportError(new ErrorLocatorImpl(), // TODO
+ // line&col
+ // nos.
+ "WSDL508", new Object[] { attrValue },
+ ErrorReporter.SEVERITY_ERROR);
+ }
+
+ return scheme;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.woden.xml.HTTPAuthenticationSchemeAttr#getScheme()
+ */
+ public HTTPAuthenticationScheme getScheme() {
+
+ return (HTTPAuthenticationScheme) getContent();
+ }
+
+}
Added: incubator/woden/java/src/org/apache/woden/wsdl20/extensions/http/HTTPAuthenticationScheme.java
URL: http://svn.apache.org/viewvc/incubator/woden/java/src/org/apache/woden/wsdl20/extensions/http/HTTPAuthenticationScheme.java?rev=410729&view=auto
==============================================================================
--- incubator/woden/java/src/org/apache/woden/wsdl20/extensions/http/HTTPAuthenticationScheme.java (added)
+++ incubator/woden/java/src/org/apache/woden/wsdl20/extensions/http/HTTPAuthenticationScheme.java Wed May 31 20:26:54 2006
@@ -0,0 +1,56 @@
+/**
+ * Copyright 2005 Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.woden.wsdl20.extensions.http;
+
+/**
+ * This class defines the values of the {http authentication scheme} property of
+ * Endpoint as defined by the HTTP Binding extension. This property indicates
+ * the HTTP authenication scheme used.
+ *
+ * <p>
+ * The property is one of:
+ * <ul>
+ * <li>basic</li>
+ * <li>digest</li
+ * </ul>
+ * </p>
+ *
+ * <p>
+ * This class uses the typesafe enum pattern. Applications should use the public
+ * static final constants defined in this class to specify or to evaluate the
+ * HTTP authentication scheme.
+ * </p>
+ *
+ * @author Arthur Ryman (ryman@ca.ibm.com, arthur.ryman@gmail.com)
+ */
+public class HTTPAuthenticationScheme {
+
+ private final String fValue;
+
+ private HTTPAuthenticationScheme(String value) {
+ fValue = value;
+ }
+
+ public String toString() {
+ return fValue;
+ }
+
+ public static final HTTPAuthenticationScheme BASIC = new HTTPAuthenticationScheme(
+ "basic");
+
+ public static final HTTPAuthenticationScheme DIGEST = new HTTPAuthenticationScheme(
+ "digest");
+}
Added: incubator/woden/java/src/org/apache/woden/wsdl20/extensions/http/HTTPEndpointExtensions.java
URL: http://svn.apache.org/viewvc/incubator/woden/java/src/org/apache/woden/wsdl20/extensions/http/HTTPEndpointExtensions.java?rev=410729&view=auto
==============================================================================
--- incubator/woden/java/src/org/apache/woden/wsdl20/extensions/http/HTTPEndpointExtensions.java (added)
+++ incubator/woden/java/src/org/apache/woden/wsdl20/extensions/http/HTTPEndpointExtensions.java Wed May 31 20:26:54 2006
@@ -0,0 +1,39 @@
+/**
+ * Copyright 2006 Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.woden.wsdl20.extensions.http;
+
+import org.apache.woden.wsdl20.extensions.ComponentExtensions;
+
+/**
+ * This interface represents the properties from the HTTP namespace added to the
+ * WSDL 2.0 <code>Endpoint</code> component as part of the HTTP binding
+ * extension.
+ * <p>
+ * These include:
+ * <ul>
+ * <li>{http authentication scheme}</li>
+ * <li>{http authentication realm}</li>
+ * </ul>
+ *
+ * @author Arthur Ryman (ryman@ca.ibm.com, arthur.ryman@gmail.com)
+ *
+ */
+public interface HTTPEndpointExtensions extends ComponentExtensions {
+
+ public HTTPAuthenticationScheme getHttpAuthenicationScheme();
+
+ public String getHttpAuthenticationRealm();
+}
Added: incubator/woden/java/src/org/apache/woden/xml/HTTPAuthenticationSchemeAttr.java
URL: http://svn.apache.org/viewvc/incubator/woden/java/src/org/apache/woden/xml/HTTPAuthenticationSchemeAttr.java?rev=410729&view=auto
==============================================================================
--- incubator/woden/java/src/org/apache/woden/xml/HTTPAuthenticationSchemeAttr.java (added)
+++ incubator/woden/java/src/org/apache/woden/xml/HTTPAuthenticationSchemeAttr.java Wed May 31 20:26:54 2006
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2006 Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.woden.xml;
+
+import org.apache.woden.wsdl20.extensions.http.HTTPAuthenticationScheme;
+
+/**
+ * This interface represents the value of the whttp:authenticationType
+ * attribute.
+ *
+ * @author Arthur Ryman (ryman@ca.ibm.ca, arthur.ryman@gmail.com)
+ *
+ */
+public interface HTTPAuthenticationSchemeAttr extends XMLAttr {
+
+ HTTPAuthenticationScheme getScheme();
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: woden-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: woden-dev-help@ws.apache.org