VirtualBox

Ticket #10940: virtualbox-4.2.4-xmlns.patch

File virtualbox-4.2.4-xmlns.patch, 10.5 KB (added by jmbreuer, 12 years ago)

  • src/VBox/Main/webservice/websrv-wsdl.xsl 

    diff -ur /var/tmp/VirtualBox-4.2.4_orig/src/VBox/Main/webservice/websrv-wsdl.xsl ../../../../../VirtualBox-4.2.4/src/VBox/Main/webservice/websrv-wsdl.xsl
    old new  
    9393  targetNamespace="http://schemas.xmlsoap.org/wsdl/"
    9494  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
    9595  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     96  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
    9697  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
    9798  xmlns:vbox="http://www.virtualbox.org/"
    9899  xmlns:exsl="http://exslt.org/common"
    … …  
    460461  <xsl:param name="_params" />
    461462  <xsl:param name="_valuetype" />       <!-- optional, for attribute setter messages -->
    462463
    463   <message>
     464  <wsdl:message>
    464465    <xsl:attribute name="name"><xsl:value-of select="concat($_ifname, $G_classSeparator, $_methodname, $G_methodRequest)" /></xsl:attribute>
    465466
    466467    <xsl:call-template name="convertTypeAndEmitPartOrElement">
    … …  
    469470      <xsl:with-param name="name" select="'parameters'" />
    470471      <xsl:with-param name="type" select="$G_typeIsGlobalRequestElementMarker" />
    471472      <xsl:with-param name="safearray" select="'no'" />
    472       <xsl:with-param name="elname" select="'part'" /> <!-- "part" or "element" -->
     473      <xsl:with-param name="elname" select="'wsdl:part'" /> <!-- "part" or "element" -->
    473474      <xsl:with-param name="attrname" select="'element'" />   <!-- attrib of part of element: <part type=...> or <part element=...> or <element type=...> -->
    474475    </xsl:call-template>
    475   </message>
     476  </wsdl:message>
    476477</xsl:template>
    477478
    478479<!--
    … …  
    485486  <xsl:param name="_params" />          <!-- set of parameter elements -->
    486487  <xsl:param name="_resulttype" />      <!-- for attribute getter methods only -->
    487488
    488   <message>
     489  <wsdl:message>
    489490    <xsl:attribute name="name"><xsl:copy-of select="$_ifname" /><xsl:value-of select="$G_classSeparator" /><xsl:value-of select="$_methodname" /><xsl:copy-of select="$G_methodResponse" /></xsl:attribute>
    490491
    491492    <!-- <xsl:variable name="cOutParams" select="count($_params[@dir='out']) + count($_params[@dir='return'])" /> -->
    … …  
    495496      <xsl:with-param name="name" select="'parameters'" />
    496497      <xsl:with-param name="type" select="$G_typeIsGlobalResponseElementMarker" />
    497498      <xsl:with-param name="safearray" select="'no'" />
    498       <xsl:with-param name="elname" select="'part'" /> <!-- "part" or "element" -->
     499      <xsl:with-param name="elname" select="'wsdl:part'" /> <!-- "part" or "element" -->
    499500      <xsl:with-param name="attrname" select="'element'" />   <!-- attrib of part of element: <part type=...> or <part element=...> or <element type=...> -->
    500501    </xsl:call-template>
    501   </message>
     502  </wsdl:message>
    502503</xsl:template>
    503504
    504505<!--
    … …  
    543544    <xsl:with-param name="_methodname" select="$attrSetter" />
    544545    <xsl:with-param name="_params" select="/.." /> <!-- empty set -->
    545546    <xsl:with-param name="_valuetype" select="$attrtype" />
    546     <xsl:with-param name="elname" select="'part'" /> <!-- "part" or "element" -->
     547    <xsl:with-param name="elname" select="'wsdl:part'" /> <!-- "part" or "element" -->
    547548  </xsl:call-template>
    548549  <xsl:call-template name="emitResultMessage">
    549550    <xsl:with-param name="_ifname" select="$ifname" />
    550551    <xsl:with-param name="_methodname" select="$attrSetter" />
    551552    <xsl:with-param name="_params" select="/.." /> <!-- empty set -->
    552     <xsl:with-param name="elname" select="'part'" /> <!-- "part" or "element" -->
     553    <xsl:with-param name="elname" select="'wsdl:part'" /> <!-- "part" or "element" -->
    553554  </xsl:call-template>
    554555</xsl:template>
    555556
    … …  
    566567
    567568  <xsl:call-template name="debugMsg"><xsl:with-param name="msg" select="concat('....emitInOutOperation ', $_ifname, '::', $_methodname)" /></xsl:call-template>
    568569
    569   <operation>
     570  <wsdl:operation>
    570571    <xsl:attribute name="name">
    571572      <xsl:value-of select="concat($_ifname, '_', $_methodname)" />
    572573    </xsl:attribute>
    … …  
    577578        <xsl:attribute name="style"><xsl:value-of select="$G_basefmt" /></xsl:attribute>
    578579      </soap:operation>
    579580    </xsl:if>
    580     <input>
     581    <wsdl:input>
    581582      <xsl:choose>
    582583        <xsl:when test="$_fSoap">
    583584          <soap:body>
    … …  
    589590          <xsl:attribute name="message">vbox:<xsl:copy-of select="$_ifname" /><xsl:value-of select="$G_classSeparator" /><xsl:value-of select="$_methodname" /><xsl:copy-of select="$G_methodRequest" /></xsl:attribute>
    590591        </xsl:otherwise>
    591592      </xsl:choose>
    592     </input>
     593    </wsdl:input>
    593594    <xsl:choose>
    594595      <xsl:when test="$_resulttype">
    595         <output>
     596        <wsdl:output>
    596597          <xsl:choose>
    597598            <xsl:when test="$_fSoap">
    598599              <soap:body>
    … …  
    604605              <xsl:attribute name="message">vbox:<xsl:copy-of select="$_ifname" /><xsl:value-of select="$G_classSeparator" /><xsl:value-of select="$_methodname" /><xsl:copy-of select="$G_methodResponse" /></xsl:attribute>
    605606            </xsl:otherwise>
    606607          </xsl:choose>
    607         </output>
     608        </wsdl:output>
    608609      </xsl:when>
    609610      <xsl:otherwise>
    610611        <!-- <xsl:if test="count($_params[@dir='out'] | $_params[@dir='return']) > 0"> -->
    611           <output>
     612          <wsdl:output>
    612613            <xsl:choose>
    613614              <xsl:when test="$_fSoap">
    614615                <soap:body>
    … …  
    620621                <xsl:attribute name="message">vbox:<xsl:copy-of select="$_ifname" /><xsl:value-of select="$G_classSeparator" /><xsl:value-of select="$_methodname" /><xsl:copy-of select="$G_methodResponse" /></xsl:attribute>
    621622              </xsl:otherwise>
    622623            </xsl:choose>
    623           </output>
     624          </wsdl:output>
    624625        <!-- </xsl:if> -->
    625626      </xsl:otherwise>
    626627    </xsl:choose>
    627628    <xsl:choose>
    628629      <xsl:when test="not($_fSoap)">
    629         <fault name="InvalidObjectFault" message="vbox:InvalidObjectFaultMsg" />
    630         <fault name="RuntimeFault" message="vbox:RuntimeFaultMsg" />
     630        <wsdl:fault name="InvalidObjectFault" message="vbox:InvalidObjectFaultMsg" />
     631        <wsdl:fault name="RuntimeFault" message="vbox:RuntimeFaultMsg" />
    631632      </xsl:when>
    632633      <xsl:otherwise>
    633         <fault name="InvalidObjectFault">
     634        <wsdl:fault name="InvalidObjectFault">
    634635          <soap:fault name="InvalidObjectFault">
    635636            <xsl:attribute name="use"><xsl:value-of select="$G_parmfmt" /></xsl:attribute>
    636637          </soap:fault>
    637         </fault>
    638         <fault name="RuntimeFault">
     638        </wsdl:fault>
     639        <wsdl:fault name="RuntimeFault">
    639640          <soap:fault name="RuntimeFault">
    640641            <xsl:attribute name="use"><xsl:value-of select="$G_parmfmt" /></xsl:attribute>
    641642          </soap:fault>
    642         </fault>
     643        </wsdl:fault>
    643644      </xsl:otherwise>
    644645    </xsl:choose>
    645   </operation>
     646  </wsdl:operation>
    646647</xsl:template>
    647648
    648649<!--
    … …  
    742743            <xsl:with-param name="_wsmap" select="$wsmap" />
    743744            <xsl:with-param name="_methodname" select="$methodname" />
    744745            <xsl:with-param name="_params" select="param" />
    745             <xsl:with-param name="elname" select="'part'" /> <!-- "part" or "element" -->
     746            <xsl:with-param name="elname" select="'wsdl:part'" /> <!-- "part" or "element" -->
    746747          </xsl:call-template>
    747748          <!-- emit a second "result" message only if the method has "out" arguments or a return value -->
    748749          <!-- <xsl:if test="(count(param[@dir='out'] | param[@dir='return']) > 0)"> -->
    … …  
    751752              <xsl:with-param name="_wsmap" select="$wsmap" />
    752753              <xsl:with-param name="_methodname" select="@name" />
    753754              <xsl:with-param name="_params" select="param" />
    754               <xsl:with-param name="elname" select="'part'" /> <!-- "part" or "element" -->
     755              <xsl:with-param name="elname" select="'wsdl:part'" /> <!-- "part" or "element" -->
    755756            </xsl:call-template>
    756757          <!-- </xsl:if> -->
    757758        </xsl:otherwise>
    … …  
    956957    and emit complexTypes for all method arguments and return values.
    957958-->
    958959<xsl:template match="library">
    959   <definitions
     960  <wsdl:definitions
    960961        name="VirtualBox"
    961962        xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
    962     <xsl:attribute name="xmlns">http://schemas.xmlsoap.org/wsdl/</xsl:attribute>
    963963    <xsl:attribute name="targetNamespace"><xsl:value-of select="$G_targetNamespace" /></xsl:attribute>
    964964    <!-- at top of WSDL file, dump a <types> section with user-defined types -->
    965965      <xsl:comment>
    … …  
    969969  *
    970970  ******************************************************
    971971</xsl:comment>
    972     <types>
     972    <wsdl:types>
    973973      <xsd:schema>
    974974        <xsl:attribute name="targetNamespace"><xsl:value-of select='$G_targetNamespace' /></xsl:attribute>
    975975
    … …  
    11931193      </xsd:schema>
    11941194
    11951195
    1196     </types>
     1196    </wsdl:types>
    11971197
    1198     <message name="InvalidObjectFaultMsg">
    1199       <part name="fault" element="vbox:InvalidObjectFault" />
    1200     </message>
    1201     <message name="RuntimeFaultMsg">
    1202       <part name="fault" element="vbox:RuntimeFault" />
    1203     </message>
     1198    <wsdl:message name="InvalidObjectFaultMsg">
     1199      <wsdl:part name="fault" element="vbox:InvalidObjectFault" />
     1200    </wsdl:message>
     1201    <wsdl:message name="RuntimeFaultMsg">
     1202      <wsdl:part name="fault" element="vbox:RuntimeFault" />
     1203    </wsdl:message>
    12041204
    12051205    <xsl:comment>
    12061206  ******************************************************
    … …  
    12411241      ******************************************************
    12421242    </xsl:comment>
    12431243
    1244     <portType>
     1244    <wsdl:portType>
    12451245      <xsl:attribute name="name"><xsl:copy-of select="'vbox'" /><xsl:value-of select="$G_portTypeSuffix" /></xsl:attribute>
    12461246
    12471247      <xsl:for-each select="//interface">
    … …  
    12611261          </xsl:call-template>
    12621262        </xsl:if>
    12631263      </xsl:for-each>
    1264     </portType>
     1264    </wsdl:portType>
    12651265
    12661266    <xsl:comment>
    12671267      ******************************************************
    … …  
    12711271      ******************************************************
    12721272    </xsl:comment>
    12731273
    1274     <binding>
     1274    <wsdl:binding>
    12751275      <xsl:attribute name="name"><xsl:value-of select="concat('vbox', $G_bindingSuffix)" /></xsl:attribute>
    12761276      <xsl:attribute name="type"><xsl:value-of select="concat('vbox:vbox', $G_portTypeSuffix)" /></xsl:attribute>
    12771277
    … …  
    12971297          </xsl:call-template>
    12981298        </xsl:if>
    12991299      </xsl:for-each>
    1300     </binding>
     1300    </wsdl:binding>
    13011301
    1302   </definitions>
     1302  </wsdl:definitions>
    13031303</xsl:template>
    13041304
    13051305

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette