Update of /cvsroot/xdoclet/xdoclet/modules/wsee/src/xdoclet/modules/wsee/resources In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19079/modules/wsee/src/xdoclet/modules/wsee/resources
Modified Files: web-services_xml.xdt wsdl.xdt Added Files: web-services-port-component.xdt web-services-description.xdt wsdl_methods.xdt wsdl_service.xdt wsdl_binding.xdt wsdl_porttypes.xdt Log Message: Addresses XDT-1323 and XDT-1114 --- NEW FILE: web-services-port-component.xdt --- <port-component> <XDtClass:ifHasClassTag tagName="wsee.port-component" paramName="description"> <description><![CDATA[<XDtClass:classTagValue tagName="wsee.port-component" paramName="description"/>]]></description> </XDtClass:ifHasClassTag> <XDtClass:ifHasClassTag tagName="wsee.port-component" paramName="display-name"> <display-name><XDtClass:classTagValue tagName="wsee.port-component" paramName="display-name"/></display-name> </XDtClass:ifHasClassTag> <icon> <XDtClass:ifHasClassTag tagName="wsee.port-component" paramName="small-icon"> <small-icon><XDtClass:classTagValue tagName="wsee.port-component" paramName="small-icon"/></small-icon> </XDtClass:ifHasClassTag> <XDtClass:ifHasClassTag tagName="wsee.port-component" paramName="large-icon"> <large-icon><XDtClass:classTagValue tagName="wsee.port-component" paramName="large-icon"/></large-icon> </XDtClass:ifHasClassTag> </icon> <port-component-name><XDtClass:classTagValue tagName="wsee.port-component" paramName="name"/></port-component-name> <wsdl-port><XDtClass:classTagValue tagName="wsee.port-component" paramName="name"/>Port</wsdl-port> <service-endpoint-interface><XDtWsee:serviceEndpoint/></service-endpoint-interface> <service-impl-bean> <XDtWsee:serviceEndpointLink/> </service-impl-bean> <XDtWsee:forAllHandlers> <handler> <handler-name><XDtWsee:handlerTagValue paramName="name"/></handler-name> <handler-class><XDtWsee:handlerTagValue paramName="handler-class"/></handler-class> <!-- init paramter should go here --> <soap-header xmlns:local="<XDtWsee:handlerTagValue paramName="soap-header-namespace-uri"/>">local:<XDtWsee:handlerTagValue paramName="soap-header-local-part"/></soap-header> <soap-role><XDtWsee:handlerTagValue paramName="soap-role"/></soap-role> <!-- init parameters are still lacking --> </handler> </XDtWsee:forAllHandlers> </port-component> --- NEW FILE: web-services-description.xdt --- <webservice-description> <XDtConfig:ifConfigParamNotEquals paramName="Description" value=""> <description><![CDATA[<XDtConfig:configParameterValue paramName="Description"/>]]></description> </XDtConfig:ifConfigParamNotEquals> <XDtConfig:ifConfigParamNotEquals paramName="DisplayName" value=""> <display-name><XDtConfig:configParameterValue paramName="DisplayName"/></display-name> </XDtConfig:ifConfigParamNotEquals> <icon> <XDtConfig:ifHasConfigParam paramName="SmallIcon"> <small-icon><XDtConfig:configParameterValue paramName="SmallIcon"/></small-icon> </XDtConfig:ifHasConfigParam> <XDtConfig:ifHasConfigParam paramName="LargeIcon"> <large-icon><XDtConfig:configParameterValue paramName="LargeIcon"/></large-icon> </XDtConfig:ifHasConfigParam> </icon> <XDtWsee:ifWsdlPerClass> <XDtClass:ifHasClassTag tagName="wsee.port-component" paramName="display-name"> <webservice-description-name><XDtClass:classTagValue tagName="wsee.port-component" paramName="display-name"/></webservice-description-name> </XDtClass:ifHasClassTag> <XDtClass:ifDoesntHaveClassTag tagName="wsee.port-component" paramName="display-name"> <webservice-description-name><XDtClass:classTagValue tagName="wsee.port-component" paramName="name"/></webservice-description-name> </XDtClass:ifDoesntHaveClassTag> </XDtWsee:ifWsdlPerClass> <XDtWsee:ifNotWsdlPerClass> <webservice-description-name><XDtConfig:configParameterValue paramName="Name"/></webservice-description-name> </XDtWsee:ifNotWsdlPerClass> <wsdl-file><XDtWsee:wsdlFilename/></wsdl-file> <jaxrpc-mapping-file><XDtWsee:jaxrpcMappingFilename/></jaxrpc-mapping-file> <XDtWsee:ifWsdlPerClass> <XDtMerge:merge file="xdoclet/modules/wsee/resources/web-services-port-component.xdt"></XDtMerge:merge> </XDtWsee:ifWsdlPerClass> <XDtWsee:ifNotWsdlPerClass> <XDtWsee:forAllPortComponents> <XDtMerge:merge file="xdoclet/modules/wsee/resources/web-services-port-component.xdt"></XDtMerge:merge> </XDtWsee:forAllPortComponents> </XDtWsee:ifNotWsdlPerClass> </webservice-description> --- NEW FILE: wsdl_methods.xdt --- <XDtMethod:forAllMethods> <XDtMethod:ifHasMethodTag tagName="ejb.interface-method"> <message name="<XDtClass:classTagValue tagName="wsee.port-component" paramName="name"/>_<XDtMethod:methodName/>"> <XDtParameter:forAllMethodParams> <part name="<XDtParameter:methodParamName/>" type="xsd:<XDtCollection:ifContains name="java2xsd" key="<XDtParameter:methodParamType/>"><XDtCollection:get name="java2xsd" key="<XDtParameter:methodParamType/>"/></XDtCollection:ifContains><XDtCollection:ifDoesntContain name="java2xsd" key="<XDtParameter:methodParamType/>">anyType</XDtCollection:ifDoesntContain>"/> </XDtParameter:forAllMethodParams> </message> <message name="<XDtClass:classTagValue tagName="wsee.port-component" paramName="name"/>_<XDtMethod:methodName/>Response"> <XDtMethod:ifDoesntReturnVoid> <part name="result" type="xsd:<XDtCollection:ifContains name="java2xsd" key="<XDtMethod:methodType/>"><XDtCollection:get name="java2xsd" key="<XDtMethod:methodType/>"/></XDtCollection:ifContains><XDtCollection:ifDoesntContain name="java2xsd" key="<XDtMethod:methodType/>">anyType</XDtCollection:ifDoesntContain>"/> </XDtMethod:ifDoesntReturnVoid> </message> </XDtMethod:ifHasMethodTag> </XDtMethod:forAllMethods> --- NEW FILE: wsdl_service.xdt --- <service name="<XDtClass:classTagValue tagName="wsee.port-component" paramName="name"/>"> <port name="<XDtClass:classTagValue tagName="wsee.port-component" paramName="name"/>Port" binding="tns:<XDtClass:classTagValue tagName="wsee.port-component" paramName="name"/>Binding"> <soap:address location="REPLACE_WITH_ACTUAL_URL"/> </port> </service> --- NEW FILE: wsdl_binding.xdt --- <binding name="<XDtClass:classTagValue tagName="wsee.port-component" paramName="name"/>Binding" type="tns:<XDtClass:classTagValue tagName="wsee.port-component" paramName="name"/>"> <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/> <XDtMethod:forAllMethods> <XDtMethod:ifHasMethodTag tagName="ejb.interface-method"> <operation name="<XDtMethod:methodName/>"> <soap:operation soapAction="<XDtClass:classTagValue tagName="wsee.port-component" paramName="soap-action" default=""/>"/> <input> <soap:body use="literal" namespace="<XDtWsee:namespaceURI/>"/> </input> <output> <soap:body use="literal" namespace="<XDtWsee:namespaceURI/>"/> </output> </operation> </XDtMethod:ifHasMethodTag> </XDtMethod:forAllMethods> </binding> --- NEW FILE: wsdl_porttypes.xdt --- <portType name="<XDtClass:classTagValue tagName="wsee.port-component" paramName="name"/>"> <XDtMethod:forAllMethods> <XDtMethod:ifHasMethodTag tagName="ejb.interface-method"> <operation name="<XDtMethod:methodName/>" <XDtParameter:ifHasParams>parameterOrder="<XDtParameter:forAllMethodParams><XDtParameter:methodParamName/> </XDtParameter:forAllMethodParams>"</XDtParameter:ifHasParams>> <input message="tns:<XDtClass:classTagValue tagName="wsee.port-component" paramName="name"/>_<XDtMethod:methodName/>"/> <output message="tns:<XDtClass:classTagValue tagName="wsee.port-component" paramName="name"/>_<XDtMethod:methodName/>Response"/> </operation> </XDtMethod:ifHasMethodTag> </XDtMethod:forAllMethods> </portType> Index: web-services_xml.xdt =================================================================== RCS file: /cvsroot/xdoclet/xdoclet/modules/wsee/src/xdoclet/modules/wsee/resources/web-services_xml.xdt,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** web-services_xml.xdt 12 Oct 2004 14:19:09 -0000 1.4 --- web-services_xml.xdt 4 Apr 2005 16:12:03 -0000 1.5 *************** *** 1,63 **** <?xml version="1.0" encoding="<XDtConfig:configParameterValue paramName='Xmlencoding'/>"?> ! <webservices ! xmlns="http://java.sun.com/xml/ns/j2ee" ! xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ! xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee <XDtXml:schema/>" ! version="<XDtConfig:configParameterValue paramName="WseeSpec"/>"> ! <webservice-description> ! <XDtConfig:ifConfigParamNotEquals paramName="Description" value=""> ! <description><![CDATA[<XDtConfig:configParameterValue paramName="Description"/>]]></description> ! </XDtConfig:ifConfigParamNotEquals> ! <XDtConfig:ifConfigParamNotEquals paramName="DisplayName" value=""> ! <display-name><XDtConfig:configParameterValue paramName="DisplayName"/></display-name> ! </XDtConfig:ifConfigParamNotEquals> ! <icon> ! <XDtConfig:ifHasConfigParam paramName="SmallIcon"> ! <small-icon><XDtConfig:configParameterValue paramName="SmallIcon"/></small-icon> ! </XDtConfig:ifHasConfigParam> ! <XDtConfig:ifHasConfigParam paramName="LargeIcon"> ! <large-icon><XDtConfig:configParameterValue paramName="LargeIcon"/></large-icon> ! </XDtConfig:ifHasConfigParam> ! </icon> ! <webservice-description-name><XDtConfig:configParameterValue paramName="Name"/></webservice-description-name> ! <wsdl-file><XDtConfig:configParameterValue paramName="WsdlFile"/></wsdl-file> ! <jaxrpc-mapping-file><XDtConfig:configParameterValue paramName="JaxrpcMappingFile"/></jaxrpc-mapping-file> ! <XDtWsee:forAllPortComponents> ! <port-component> ! <XDtClass:ifHasClassTag tagName="wsee.port-component" paramName="description"> ! <description><![CDATA[<XDtClass:classTagValue tagName="wsee.port-component" paramName="description"/>]]></description> ! </XDtClass:ifHasClassTag> ! <XDtClass:ifHasClassTag tagName="wsee.port" paramName="display-name"> ! <display-name><XDtClass:classTagValue tagName="wsee.port-component" paramName="display-name"/></display-name> ! </XDtClass:ifHasClassTag> ! ! <icon> ! <XDtClass:ifHasClassTag tagName="wsee.port-component" paramName="small-icon"> ! <small-icon><XDtClass:classTagValue tagName="wsee.port-component" paramName="small-icon"/></small-icon> ! </XDtClass:ifHasClassTag> ! <XDtClass:ifHasClassTag tagName="wsee.port-component" paramName="large-icon"> ! <large-icon><XDtClass:classTagValue tagName="wsee.port-component" paramName="large-icon"/></large-icon> ! </XDtClass:ifHasClassTag> ! </icon> ! <port-component-name><XDtClass:classTagValue tagName="wsee.port-component" paramName="name"/></port-component-name> ! <wsdl-port><XDtClass:classTagValue tagName="wsee.port-component" paramName="name"/></wsdl-port> ! <service-endpoint-interface><XDtWsee:serviceEndpoint/></service-endpoint-interface> ! <service-impl-bean> ! <XDtWsee:serviceEndpointLink/> ! </service-impl-bean> ! <XDtWsee:forAllHandlers> ! <handler> ! <handler-name><XDtWsee:handlerTagValue paramName="name"/></handler-name> ! <handler-class><XDtWsee:handlerTagValue paramName="handler-class"/></handler-class> ! <!-- init paramter should go here --> ! <soap-header xmlns:local="<XDtWsee:handlerTagValue paramName="soap-header-namespace-uri"/>">local:<XDtWsee:handlerTagValue paramName="soap-header-local-part"/></soap-header> ! <soap-role><XDtWsee:handlerTagValue paramName="soap-role"/></soap-role> ! <!-- init parameters are still lacking --> ! </handler> ! </XDtWsee:forAllHandlers> ! </port-component> ! </XDtWsee:forAllPortComponents> ! </webservice-description> ! </webservices> ! --- 1,17 ---- <?xml version="1.0" encoding="<XDtConfig:configParameterValue paramName='Xmlencoding'/>"?> ! <webservices ! xmlns="http://java.sun.com/xml/ns/j2ee" ! xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ! xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee <XDtXml:schema/>" ! version="<XDtConfig:configParameterValue paramName="WseeSpec"/>"> ! ! <XDtWsee:ifWsdlPerClass> ! <XDtWsee:forAllPortComponents> ! <XDtMerge:merge file="xdoclet/modules/wsee/resources/web-services-description.xdt"></XDtMerge:merge> ! </XDtWsee:forAllPortComponents> ! </XDtWsee:ifWsdlPerClass> ! ! <XDtWsee:ifNotWsdlPerClass> ! <XDtMerge:merge file="xdoclet/modules/wsee/resources/web-services-description.xdt"></XDtMerge:merge> ! </XDtWsee:ifNotWsdlPerClass> Index: wsdl.xdt =================================================================== RCS file: /cvsroot/xdoclet/xdoclet/modules/wsee/src/xdoclet/modules/wsee/resources/wsdl.xdt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** wsdl.xdt 28 Sep 2004 23:42:18 -0000 1.2 --- wsdl.xdt 4 Apr 2005 16:12:04 -0000 1.3 *************** *** 1,43 **** ! <?xml version="1.0" encoding="<XDtConfig:configParameterValue paramName='Xmlencoding'/>"?> ! ! <wsdl:definitions ! targetNamespace="http://test.jboss.org/handler" ! xmlns:intf="http://test.jboss.org/handler" ! xmlns="http://schemas.xmlsoap.org/wsdl/" ! xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" ! xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" ! xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" ! xmlns:xsd="http://www.w3.org/2001/XMLSchema"> ! ! <wsdl:message name="testResponse"> ! </wsdl:message> ! <wsdl:message name="testRequest"> ! </wsdl:message> ! ! <wsdl:portType name="HandlerPort"> ! <wsdl:operation name="test"> ! <wsdl:input message="intf:testRequest"/> ! <wsdl:output message="intf:testResponse"/> ! </wsdl:operation> ! </wsdl:portType> ! ! <wsdl:binding name="HandlerBinding" type="intf:HandlerPort"> ! <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> ! <wsdl:operation name="test"> ! <wsdlsoap:operation soapAction=""/> ! <wsdl:input> ! <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://test.jboss.org/handler" use="encoded"/> ! </wsdl:input> ! <wsdl:output> ! <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://test.jboss.org/handler" use="encoded"/> ! </wsdl:output> ! </wsdl:operation> ! </wsdl:binding> ! ! <wsdl:service name="Handler"> ! <wsdl:port binding="intf:HandlerBinding" name="Handler"> ! <wsdlsoap:address location="http://dummy_location"/> ! </wsdl:port> ! </wsdl:service> ! ! </wsdl:definitions> --- 1,51 ---- ! <?xml version="1.0" encoding="<XDtConfig:configParameterValue paramName='Xmlencoding'/>"?> ! <XDtCollection:create name="java2xsd" type="map"/> ! <XDtCollection:put name="java2xsd" key="int" value="int"/> ! <XDtCollection:put name="java2xsd" key="short" value="short"/> ! <XDtCollection:put name="java2xsd" key="long" value="long"/> ! <XDtCollection:put name="java2xsd" key="float" value="float"/> ! <XDtCollection:put name="java2xsd" key="double" value="double"/> ! <XDtCollection:put name="java2xsd" key="byte" value="byte"/> ! <XDtCollection:put name="java2xsd" key="boolean" value="boolean"/> ! <XDtCollection:put name="java2xsd" key="char" value="string"/> ! <XDtCollection:put name="java2xsd" key="java.lang.Integer" value="int"/> ! <XDtCollection:put name="java2xsd" key="java.lang.Short" value="short"/> ! <XDtCollection:put name="java2xsd" key="java.lang.Long" value="long"/> ! <XDtCollection:put name="java2xsd" key="java.lang.Float" value="float"/> ! <XDtCollection:put name="java2xsd" key="java.lang.Double" value="double"/> ! <XDtCollection:put name="java2xsd" key="java.lang.Byte" value="byte"/> ! <XDtCollection:put name="java2xsd" key="java.lang.Boolean" value="boolean"/> ! <XDtCollection:put name="java2xsd" key="java.lang.Character" value="string"/> ! <XDtCollection:put name="java2xsd" key="java.lang.String" value="string"/> ! <XDtCollection:put name="java2xsd" key="java.math.BigInteger" value="integer"/> ! <XDtCollection:put name="java2xsd" key="java.math.BigDecimal" value="decimal"/> ! <XDtCollection:put name="java2xsd" key="java.util.Calendar" value="dateTime"/> ! <XDtCollection:put name="java2xsd" key="java.util.Date" value="dateTime"/> ! <XDtCollection:put name="java2xsd" key="java.sql.Date" value="date"/> ! <XDtCollection:put name="java2xsd" key="byte[]" value="base64Binary"/> ! <XDtCollection:put name="java2xsd" key="java.net.URI" value="anyURI"/> ! <XDtCollection:put name="java2xsd" key="javax.xml.namespace.QName" value="Qname"/> ! <definitions <XDtWsee:ifWsdlPerClass> ! name="<XDtClass:classTagValue tagName="wsee.port-component" paramName="name" default=""/>" </XDtWsee:ifWsdlPerClass> ! targetNamespace="<XDtWsee:namespaceURI/>" ! xmlns:tns="<XDtWsee:namespaceURI/>" ! xmlns="http://schemas.xmlsoap.org/wsdl/" ! xmlns:xsd="http://www.w3.org/2001/XMLSchema" ! xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> ! ! <XDtWsee:ifWsdlPerClass> ! <XDtMerge:merge file="xdoclet/modules/wsee/resources/wsdl_methods.xdt"></XDtMerge:merge> ! <XDtMerge:merge file="xdoclet/modules/wsee/resources/wsdl_porttypes.xdt"></XDtMerge:merge> ! <XDtMerge:merge file="xdoclet/modules/wsee/resources/wsdl_binding.xdt"></XDtMerge:merge> ! <XDtMerge:merge file="xdoclet/modules/wsee/resources/wsdl_service.xdt"></XDtMerge:merge> ! </XDtWsee:ifWsdlPerClass> ! ! <XDtWsee:ifNotWsdlPerClass> ! <XDtWsee:forAllPortComponents><XDtMerge:merge file="xdoclet/modules/wsee/resources/wsdl_methods.xdt"></XDtMerge:merge></XDtWsee:forAllPortComponents> ! <XDtWsee:forAllPortComponents><XDtMerge:merge file="xdoclet/modules/wsee/resources/wsdl_porttypes.xdt"></XDtMerge:merge></XDtWsee:forAllPortComponents> ! <XDtWsee:forAllPortComponents><XDtMerge:merge file="xdoclet/modules/wsee/resources/wsdl_binding.xdt"></XDtMerge:merge></XDtWsee:forAllPortComponents> ! <XDtWsee:forAllPortComponents><XDtMerge:merge file="xdoclet/modules/wsee/resources/wsdl_service.xdt"></XDtMerge:merge></XDtWsee:forAllPortComponents> ! </XDtWsee:ifNotWsdlPerClass> ! ! </definitions> ! <XDtCollection:destroy name="java2xsd"/> \ No newline at end of file ------------------------------------------------------- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click _______________________________________________ xdoclet-devel mailing list xdoclet-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/xdoclet-devel