Author: ryman
Date: Wed May 31 09:46:48 2006
New Revision: 410596
URL: http://svn.apache.org/viewvc?rev=410596&view=rev
Log:
[WODEN-16, WODEN-17] Added test for OPTIONAL references to components and
regenerated 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=410596&r1=410595&r2=410596&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=410596&r1=410595&r2=410596&view=diff
==============================================================================
--- incubator/woden/java/ant-test/test.xml (original)
+++ incubator/woden/java/ant-test/test.xml Wed May 31 09:46:48 2006
@@ -5,545 +5,381 @@
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-30533424'>
+xml:id='id-1236687821'>
<interfaces>
- <interfaceComponent xml:id='id-14620722'>
+ <interfaceComponent xml:id='id-565926862'>
<name>
-
<cmbase:namespaceName>http://www.w3.org/2005/08/sparql-protocol-query/#</cmbase:namespaceName>
- <cmbase:localName>SparqlQuery</cmbase:localName>
+ <cmbase:namespaceName>http://example.org/Service</cmbase:namespaceName>
+ <cmbase:localName>EchoInterface</cmbase:localName>
</name>
- <interfaceFaults>
- <interfaceFaultComponent xml:id='id-5226838'>
- <name>
-
<cmbase:namespaceName>http://www.w3.org/2005/08/sparql-protocol-query/#</cmbase:namespaceName>
- <cmbase:localName>MalformedQuery</cmbase:localName>
- </name>
- <elementDeclaration ref='id-null'/>
- <parent ref='id-14620722'/>
- </interfaceFaultComponent>
- <interfaceFaultComponent xml:id='id-1977511'>
- <name>
-
<cmbase:namespaceName>http://www.w3.org/2005/08/sparql-protocol-query/#</cmbase:namespaceName>
- <cmbase:localName>QueryRequestRefused</cmbase:localName>
- </name>
- <elementDeclaration ref='id-null'/>
- <parent ref='id-14620722'/>
- </interfaceFaultComponent>
- </interfaceFaults>
<interfaceOperations>
- <interfaceOperationComponent xml:id='id-6504030'>
+ <interfaceOperationComponent xml:id='id-607427534'>
<name>
-
<cmbase:namespaceName>http://www.w3.org/2005/08/sparql-protocol-query/#</cmbase:namespaceName>
- <cmbase:localName>query</cmbase:localName>
+
<cmbase:namespaceName>http://example.org/Service</cmbase:namespaceName>
+ <cmbase:localName>Echo</cmbase:localName>
</name>
<messageExchangePattern>http://www.w3.org/2006/01/wsdl/in-out</messageExchangePattern>
<interfaceMessageReferences>
- <interfaceMessageReferenceComponent xml:id='id-22507120'>
+ <interfaceMessageReferenceComponent xml:id='id-635362254'>
<messageLabel>In</messageLabel>
<direction>in</direction>
<messageContentModel>#element</messageContentModel>
- <elementDeclaration ref='id-null'/>
- <parent ref='id-6504030'/>
+ <elementDeclaration ref='id-337664973'/>
+ <parent ref='id-607427534'/>
</interfaceMessageReferenceComponent>
- <interfaceMessageReferenceComponent xml:id='id-18055655'>
+ <interfaceMessageReferenceComponent xml:id='id-951409614'>
<messageLabel>Out</messageLabel>
<direction>out</direction>
<messageContentModel>#element</messageContentModel>
- <elementDeclaration ref='id-null'/>
- <parent ref='id-6504030'/>
+ <elementDeclaration ref='id-337664973'/>
+ <parent ref='id-607427534'/>
</interfaceMessageReferenceComponent>
</interfaceMessageReferences>
- <interfaceFaultReferences>
- <interfaceFaultReferenceComponent xml:id='id-24417480'>
- <interfaceFault ref='id-5226838'/>
- <messageLabel>Out</messageLabel>
- <direction>out</direction>
- <parent ref='id-6504030'/>
- </interfaceFaultReferenceComponent>
- <interfaceFaultReferenceComponent xml:id='id-13884241'>
- <interfaceFault ref='id-1977511'/>
- <messageLabel>Out</messageLabel>
- <direction>out</direction>
- <parent ref='id-6504030'/>
- </interfaceFaultReferenceComponent>
- </interfaceFaultReferences>
- <parent ref='id-14620722'/>
+ <parent ref='id-565926862'/>
</interfaceOperationComponent>
</interfaceOperations>
</interfaceComponent>
</interfaces>
<bindings>
- <bindingComponent xml:id='id-31817359'>
+ <bindingComponent xml:id='id-965204942'>
<name>
-
<cmbase:namespaceName>http://www.w3.org/2005/08/sparql-protocol-query/#</cmbase:namespaceName>
- <cmbase:localName>queryHttpGet</cmbase:localName>
+ <cmbase:namespaceName>http://example.org/Service</cmbase:namespaceName>
+ <cmbase:localName>EchoSOAPBinding</cmbase:localName>
</name>
- <interface ref='id-14620722'/>
- <type>http://www.w3.org/2006/01/wsdl/http</type>
- <bindingFaults>
- <bindingFaultComponent xml:id='id-14688457'>
- <interfaceFault ref='id-5226838'/>
- <parent ref='id-31817359'/>
- </bindingFaultComponent>
- <bindingFaultComponent xml:id='id-8949356'>
- <interfaceFault ref='id-1977511'/>
- <parent ref='id-31817359'/>
- </bindingFaultComponent>
- </bindingFaults>
- <bindingOperations>
- <bindingOperationComponent xml:id='id-3794357'>
- <interfaceOperation ref='id-6504030'/>
- <parent ref='id-31817359'/>
- </bindingOperationComponent>
- </bindingOperations>
- </bindingComponent>
- <bindingComponent xml:id='id-18346782'>
- <name>
-
<cmbase:namespaceName>http://www.w3.org/2005/08/sparql-protocol-query/#</cmbase:namespaceName>
- <cmbase:localName>queryHttpPost</cmbase:localName>
- </name>
- <interface ref='id-14620722'/>
- <type>http://www.w3.org/2006/01/wsdl/http</type>
- <bindingFaults>
- <bindingFaultComponent xml:id='id-22700073'>
- <interfaceFault ref='id-5226838'/>
- <parent ref='id-18346782'/>
- </bindingFaultComponent>
- <bindingFaultComponent xml:id='id-6131844'>
- <interfaceFault ref='id-1977511'/>
- <parent ref='id-18346782'/>
- </bindingFaultComponent>
- </bindingFaults>
- <bindingOperations>
- <bindingOperationComponent xml:id='id-12245160'>
- <interfaceOperation ref='id-6504030'/>
- <parent ref='id-18346782'/>
- </bindingOperationComponent>
- </bindingOperations>
- </bindingComponent>
- <bindingComponent xml:id='id-3346521'>
- <name>
-
<cmbase:namespaceName>http://www.w3.org/2005/08/sparql-protocol-query/#</cmbase:namespaceName>
- <cmbase:localName>querySoap</cmbase:localName>
- </name>
- <interface ref='id-14620722'/>
<type>http://www.w3.org/2006/01/wsdl/soap</type>
- <bindingFaults>
- <bindingFaultComponent xml:id='id-7760420'>
- <interfaceFault ref='id-5226838'/>
- <parent ref='id-3346521'/>
- <cmsoap:soapFaultCode>[EMAIL PROTECTED]</cmsoap:soapFaultCode>
- <cmsoap:soapFaultSubodes>[EMAIL PROTECTED]</cmsoap:soapFaultSubodes>
- </bindingFaultComponent>
- <bindingFaultComponent xml:id='id-9818046'>
- <interfaceFault ref='id-1977511'/>
- <parent ref='id-3346521'/>
- <cmsoap:soapFaultCode>[EMAIL PROTECTED]</cmsoap:soapFaultCode>
- <cmsoap:soapFaultSubodes>[EMAIL PROTECTED]</cmsoap:soapFaultSubodes>
- </bindingFaultComponent>
- </bindingFaults>
- <bindingOperations>
- <bindingOperationComponent xml:id='id-26542488'>
- <interfaceOperation ref='id-6504030'/>
- <parent ref='id-3346521'/>
-
<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-14314484'>
+ <services>
+ <serviceComponent xml:id='id-988355534'>
<name>
-
<cmbase:namespaceName>http://www.w3.org/2005/sparql-results#</cmbase:namespaceName>
- <cmbase:localName>binding</cmbase:localName>
+ <cmbase:namespaceName>http://example.org/Service</cmbase:namespaceName>
+ <cmbase:localName>EchoService</cmbase:localName>
</name>
- <system>http://www.w3.org/2001/XMLSchema</system>
- </elementDeclarationComponent>
- <elementDeclarationComponent xml:id='id-31820984'>
- <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-24744797'>
- <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-12182618'>
- <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-4126736'>
- <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-421988'>
- <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-12376621'>
- <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-9949215'>
- <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-14721926'>
- <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-1043272'>
- <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-18871350'>
+ <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'>
<name>
-
<cmbase:namespaceName>http://www.w3.org/2005/sparql-results#</cmbase:namespaceName>
- <cmbase:localName>variable</cmbase:localName>
+ <cmbase:namespaceName>http://example.org/Service</cmbase:namespaceName>
+ <cmbase:localName>myElement</cmbase:localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</elementDeclarationComponent>
</elementDeclarations>
<typeDefinitions>
- <typeDefinitionComponent xml:id='id-18725445'>
+ <typeDefinitionComponent xml:id='id-320101325'>
<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-11549664'>
+ <typeDefinitionComponent xml:id='id-322624461'>
<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-2814081'>
+ <typeDefinitionComponent xml:id='id-326228941'>
<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-18064701'>
+ <typeDefinitionComponent xml:id='id-326294477'>
<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-12929374'>
+ <typeDefinitionComponent xml:id='id-325901261'>
<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-5503831'>
+ <typeDefinitionComponent xml:id='id-323640269'>
<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-26882784'>
+ <typeDefinitionComponent xml:id='id-323312589'>
<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-8534260'>
+ <typeDefinitionComponent xml:id='id-321706957'>
<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-23668144'>
+ <typeDefinitionComponent xml:id='id-322952141'>
<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-2719739'>
+ <typeDefinitionComponent xml:id='id-325245901'>
<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-9523050'>
+ <typeDefinitionComponent xml:id='id-326818765'>
<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-32820206'>
+ <typeDefinitionComponent xml:id='id-322755533'>
<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-7896426'>
+ <typeDefinitionComponent xml:id='id-321969101'>
<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-7461949'>
+ <typeDefinitionComponent xml:id='id-324852685'>
<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-20079748'>
+ <typeDefinitionComponent xml:id='id-327015373'>
<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-23414511'>
+ <typeDefinitionComponent xml:id='id-326556621'>
<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-1321194'>
+ <typeDefinitionComponent xml:id='id-320822221'>
<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-25840096'>
+ <typeDefinitionComponent xml:id='id-321444813'>
<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-23930419'>
+ <typeDefinitionComponent xml:id='id-331537357'>
<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-15142448'>
+ <typeDefinitionComponent xml:id='id-322558925'>
<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-22316618'>
+ <typeDefinitionComponent xml:id='id-319019981'>
<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-3969559'>
+ <typeDefinitionComponent xml:id='id-325704653'>
<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-10175206'>
+ <typeDefinitionComponent xml:id='id-322165709'>
<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-21307627'>
+ <typeDefinitionComponent xml:id='id-320363469'>
<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-24389376'>
+ <typeDefinitionComponent xml:id='id-324918221'>
<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-11317592'>
+ <typeDefinitionComponent xml:id='id-325114829'>
<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-28259286'>
+ <typeDefinitionComponent xml:id='id-322821069'>
<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-24392121'>
+ <typeDefinitionComponent xml:id='id-326360013'>
<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-23886295'>
+ <typeDefinitionComponent xml:id='id-322984909'>
<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-11746570'>
+ <typeDefinitionComponent xml:id='id-320494541'>
<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-23894119'>
+ <typeDefinitionComponent xml:id='id-323443661'>
<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-9030750'>
+ <typeDefinitionComponent xml:id='id-323050445'>
<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-13121485'>
+ <typeDefinitionComponent xml:id='id-322493389'>
<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-13080585'>
+ <typeDefinitionComponent xml:id='id-319839181'>
<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-30308427'>
+ <typeDefinitionComponent xml:id='id-320166861'>
<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-3916915'>
+ <typeDefinitionComponent xml:id='id-327080909'>
<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-31365828'>
+ <typeDefinitionComponent xml:id='id-323378125'>
<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-25345246'>
+ <typeDefinitionComponent xml:id='id-322689997'>
<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-4047035'>
+ <typeDefinitionComponent xml:id='id-326622157'>
<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-3686501'>
+ <typeDefinitionComponent xml:id='id-321084365'>
<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-17547166'>
+ <typeDefinitionComponent xml:id='id-319282125'>
<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-5324129'>
+ <typeDefinitionComponent xml:id='id-326032333'>
<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-26530674'>
+ <typeDefinitionComponent xml:id='id-326425549'>
<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-29752800'>
+ <typeDefinitionComponent xml:id='id-325639117'>
<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-27165481'>
- <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=410596&r1=410595&r2=410596&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
09:46:48 2006
@@ -343,7 +343,7 @@
beginElement("interfaceFaultComponent", idAttribute(component));
write("name", component.getName());
- writeRef("elementDeclaration",
component.getElementDeclaration());
+ writeOptionalRef("elementDeclaration",
component.getElementDeclaration());
write("features", component.getFeatures());
write("properties", component.getProperties());
writeRef("parent", component.getParent());
@@ -462,7 +462,7 @@
write("messageLabel", component.getMessageLabel().toString());
write("direction", component.getDirection().toString());
write("messageContentModel",
component.getMessageContentModel());
- writeRef("elementDeclaration",
component.getElementDeclaration());
+ writeOptionalRef("elementDeclaration",
component.getElementDeclaration());
write("features", component.getFeatures());
write("properties", component.getProperties());
writeRef("parent", component.getParent());
@@ -554,7 +554,7 @@
beginElement(tag, idAttribute(component));
write("name", component.getName());
- writeRef("interface", component.getInterface());
+ writeOptionalRef("interface", component.getInterface());
write("type", component.getType());
write("bindingFaults", component.getBindingFaults());
write("bindingOperations", component.getBindingOperations());
@@ -1177,7 +1177,7 @@
beginElement(tag, idAttribute(component));
write("ref", component.getRef());
- writeRef("valueConstraint", component.getValueConstraint());
+ writeOptionalRef("valueConstraint",
component.getValueConstraint());
writeAny("value", component.getValue());
writeRef("parent", component.getParent());
@@ -1233,6 +1233,14 @@
// TODO: write element content correctly
element(tag, o.toString());
+ }
+
+ private void writeOptionalRef(String tag, Object o) {
+
+ if (o != null) {
+
+ writeRef(tag, o);
+ }
}
private void writeRef(String tag, Object o) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
