IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 2921


Ignore:
Timestamp:
Jan 5, 2005, 6:44:08 PM (22 years ago)
Author:
jhoblitt
Message:

gsoap compatibility fixes

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Nebulous-Server/idata.wsdl

    r2910 r2921  
    11<?xml version="1.0"?>
    22<definitions name="IDataServer"
    3     targetNamespace="urn:PS/IPP/IData/Server"
    4     xmlns:tns="urn:PS/IPP/IData/Server"
     3    targetNamespace="urn:PS/IPP/IData/Server/SOAP"
     4    xmlns:tns="urn:PS/IPP/IData/Server/SOAP"
    55    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
    66    xmlns:enc="http://schemas.xmlsoap.org/soap/encoding/"
    77    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
    88    xmlns="http://schemas.xmlsoap.org/wsdl/"
    9     xmlns:ns="urn:PS/IPP/IData/Server">
     9    xmlns:ns="urn:PS/IPP/IData/Server/SOAP">
    1010
    1111    <message name="create_objectRequest">
    … …  
    1616    </message>
    1717    <message name="create_objectResponse">
    18         <part name="uri" type="xsd:string" />
     18        <part name="result" type="xsd:string" />
    1919    </message>
    2020
    … …  
    2424    </message>
    2525    <message name="replicate_objectResponse">
    26         <part name="uri" type="xsd:string" />
     26        <part name="result" type="xsd:string" />
    2727    </message>
    2828
    … …  
    3232    </message>
    3333    <message name="lock_objectResponse">
    34         <part name="sucess" type="xsd:boolean" />
     34        <part name="result" type="xsd:int" />
    3535    </message>
    3636
    … …  
    4040    </message>
    4141    <message name="unlock_objectResponse">
    42         <part name="sucess" type="xsd:boolean" />
     42        <part name="result" type="xsd:int" />
    4343    </message>
    4444
    … …  
    4949    <message name="find_instancesResponse">
    5050        <!-- fixme -->
    51         <part name="sucess" type="xsd:boolean" />
     51        <part name="result" type="xsd:int" />
    5252    </message>
    5353
    5454    <message name="delete_instanceRequest">
    5555        <part name="uri" type="xsd:string" />
    56         <part name="volume" type="xsd:string" />
    5756    </message>
    5857    <message name="delete_instanceResponse">
    59         <part name="sucess" type="xsd:boolean" />
     58        <part name="result" type="xsd:int" />
    6059    </message>
    6160
    … …  
    6564    <message name="stat_objectResponse">
    6665        <!-- fixme -->
    67         <part name="sucess" type="xsd:boolean" />
    68     </message>
    69 
    70 
    71     <portType name="PS/IPP/IData/ServerPort">
     66        <part name="result" type="xsd:int" />
     67    </message>
     68
     69
     70    <portType name="PS/IPP/IData/Server/SOAPPort">
    7271        <operation name="create_object">
    7372            <input  message="tns:create_objectRequest" />
    … …  
    122121
    123122
    124     <binding name="SOAP" type="tns:PS/IPP/IData/ServerPort">
     123    <binding name="SOAP" type="tns:PS/IPP/IData/Server/SOAPPort">
    125124        <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http" />
    126125        <operation name="create_object">
    127             <soap:operation soapAction="urn:PS/IPP/IData/Server#create_object" />
    128             <input>
    129                 <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server"
    130                     encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
    131             </input>
    132             <output>
    133                 <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server"
     126            <soap:operation soapAction="urn:PS/IPP/IData/Server/SOAP#create_object" />
     127            <input>
     128                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
     129                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
     130            </input>
     131            <output>
     132                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
    134133                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
    135134            </output>
    136135        </operation>
    137136        <operation name="replicate_object">
    138             <soap:operation soapAction="urn:PS/IPP/IData/Server#replicate_object" />
    139             <input>
    140                 <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server"
    141                     encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
    142             </input>
    143             <output>
    144                 <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server"
     137            <soap:operation soapAction="urn:PS/IPP/IData/Server/SOAP#replicate_object" />
     138            <input>
     139                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
     140                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
     141            </input>
     142            <output>
     143                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
    145144                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
    146145            </output>
    147146        </operation>
    148147        <operation name="lock_object">
    149             <soap:operation soapAction="urn:PS/IPP/IData/Server#lock_object" />
    150             <input>
    151                 <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server"
    152                     encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
    153             </input>
    154             <output>
    155                 <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server"
     148            <soap:operation soapAction="urn:PS/IPP/IData/Server/SOAP#lock_object" />
     149            <input>
     150                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
     151                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
     152            </input>
     153            <output>
     154                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
    156155                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
    157156            </output>
    158157        </operation>
    159158        <operation name="unlock_object">
    160             <soap:operation soapAction="urn:PS/IPP/IData/Server#unlock_object" />
    161             <input>
    162                 <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server"
    163                     encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
    164             </input>
    165             <output>
    166                 <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server"
     159            <soap:operation soapAction="urn:PS/IPP/IData/Server/SOAP#unlock_object" />
     160            <input>
     161                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
     162                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
     163            </input>
     164            <output>
     165                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
    167166                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
    168167            </output>
    169168        </operation>
    170169        <operation name="find_instances">
    171             <soap:operation soapAction="urn:PS/IPP/IData/Server#find_instances" />
    172             <input>
    173                 <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server"
    174                     encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
    175             </input>
    176             <output>
    177                 <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server"
     170            <soap:operation soapAction="urn:PS/IPP/IData/Server/SOAP#find_instances" />
     171            <input>
     172                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
     173                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
     174            </input>
     175            <output>
     176                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
    178177                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
    179178            </output>
    180179        </operation>
    181180        <operation name="delete_instance">
    182             <soap:operation soapAction="urn:PS/IPP/IData/Server#delete_instance" />
    183             <input>
    184                 <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server"
    185                     encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
    186             </input>
    187             <output>
    188                 <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server"
     181            <soap:operation soapAction="urn:PS/IPP/IData/Server/SOAP#delete_instance" />
     182            <input>
     183                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
     184                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
     185            </input>
     186            <output>
     187                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
    189188                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
    190189            </output>
    191190        </operation>
    192191        <operation name="stat_object">
    193             <soap:operation soapAction="urn:PS/IPP/IData/Server#stat_object" />
    194             <input>
    195                 <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server"
    196                     encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
    197             </input>
    198             <output>
    199                 <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server"
     192            <soap:operation soapAction="urn:PS/IPP/IData/Server/SOAP#stat_object" />
     193            <input>
     194                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
     195                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
     196            </input>
     197            <output>
     198                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
    200199                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
    201200            </output>
    … …  
    204203
    205204
    206     <service name="PS/IPP/IData/Server">
    207         <port name="PS/IPP/IData/ServerPort" binding="tns:SOAP">
     205    <service name="PS/IPP/IData/Server/SOAP">
     206        <port name="PS/IPP/IData/Server/SOAPPort" binding="tns:SOAP">
    208207            <soap:address location="http://localhost:80/idata" />
    209208        </port>

  • trunk/Nebulous/idata.wsdl

    r2910 r2921  
    11<?xml version="1.0"?>
    22<definitions name="IDataServer"
    3     targetNamespace="urn:PS/IPP/IData/Server"
    4     xmlns:tns="urn:PS/IPP/IData/Server"
     3    targetNamespace="urn:PS/IPP/IData/Server/SOAP"
     4    xmlns:tns="urn:PS/IPP/IData/Server/SOAP"
    55    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
    66    xmlns:enc="http://schemas.xmlsoap.org/soap/encoding/"
    77    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
    88    xmlns="http://schemas.xmlsoap.org/wsdl/"
    9     xmlns:ns="urn:PS/IPP/IData/Server">
     9    xmlns:ns="urn:PS/IPP/IData/Server/SOAP">
    1010
    1111    <message name="create_objectRequest">
    … …  
    1616    </message>
    1717    <message name="create_objectResponse">
    18         <part name="uri" type="xsd:string" />
     18        <part name="result" type="xsd:string" />
    1919    </message>
    2020
    … …  
    2424    </message>
    2525    <message name="replicate_objectResponse">
    26         <part name="uri" type="xsd:string" />
     26        <part name="result" type="xsd:string" />
    2727    </message>
    2828
    … …  
    3232    </message>
    3333    <message name="lock_objectResponse">
    34         <part name="sucess" type="xsd:boolean" />
     34        <part name="result" type="xsd:int" />
    3535    </message>
    3636
    … …  
    4040    </message>
    4141    <message name="unlock_objectResponse">
    42         <part name="sucess" type="xsd:boolean" />
     42        <part name="result" type="xsd:int" />
    4343    </message>
    4444
    … …  
    4949    <message name="find_instancesResponse">
    5050        <!-- fixme -->
    51         <part name="sucess" type="xsd:boolean" />
     51        <part name="result" type="xsd:int" />
    5252    </message>
    5353
    5454    <message name="delete_instanceRequest">
    5555        <part name="uri" type="xsd:string" />
    56         <part name="volume" type="xsd:string" />
    5756    </message>
    5857    <message name="delete_instanceResponse">
    59         <part name="sucess" type="xsd:boolean" />
     58        <part name="result" type="xsd:int" />
    6059    </message>
    6160
    … …  
    6564    <message name="stat_objectResponse">
    6665        <!-- fixme -->
    67         <part name="sucess" type="xsd:boolean" />
    68     </message>
    69 
    70 
    71     <portType name="PS/IPP/IData/ServerPort">
     66        <part name="result" type="xsd:int" />
     67    </message>
     68
     69
     70    <portType name="PS/IPP/IData/Server/SOAPPort">
    7271        <operation name="create_object">
    7372            <input  message="tns:create_objectRequest" />
    … …  
    122121
    123122
    124     <binding name="SOAP" type="tns:PS/IPP/IData/ServerPort">
     123    <binding name="SOAP" type="tns:PS/IPP/IData/Server/SOAPPort">
    125124        <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http" />
    126125        <operation name="create_object">
    127             <soap:operation soapAction="urn:PS/IPP/IData/Server#create_object" />
    128             <input>
    129                 <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server"
    130                     encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
    131             </input>
    132             <output>
    133                 <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server"
     126            <soap:operation soapAction="urn:PS/IPP/IData/Server/SOAP#create_object" />
     127            <input>
     128                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
     129                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
     130            </input>
     131            <output>
     132                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
    134133                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
    135134            </output>
    136135        </operation>
    137136        <operation name="replicate_object">
    138             <soap:operation soapAction="urn:PS/IPP/IData/Server#replicate_object" />
    139             <input>
    140                 <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server"
    141                     encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
    142             </input>
    143             <output>
    144                 <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server"
     137            <soap:operation soapAction="urn:PS/IPP/IData/Server/SOAP#replicate_object" />
     138            <input>
     139                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
     140                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
     141            </input>
     142            <output>
     143                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
    145144                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
    146145            </output>
    147146        </operation>
    148147        <operation name="lock_object">
    149             <soap:operation soapAction="urn:PS/IPP/IData/Server#lock_object" />
    150             <input>
    151                 <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server"
    152                     encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
    153             </input>
    154             <output>
    155                 <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server"
     148            <soap:operation soapAction="urn:PS/IPP/IData/Server/SOAP#lock_object" />
     149            <input>
     150                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
     151                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
     152            </input>
     153            <output>
     154                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
    156155                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
    157156            </output>
    158157        </operation>
    159158        <operation name="unlock_object">
    160             <soap:operation soapAction="urn:PS/IPP/IData/Server#unlock_object" />
    161             <input>
    162                 <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server"
    163                     encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
    164             </input>
    165             <output>
    166                 <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server"
     159            <soap:operation soapAction="urn:PS/IPP/IData/Server/SOAP#unlock_object" />
     160            <input>
     161                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
     162                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
     163            </input>
     164            <output>
     165                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
    167166                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
    168167            </output>
    169168        </operation>
    170169        <operation name="find_instances">
    171             <soap:operation soapAction="urn:PS/IPP/IData/Server#find_instances" />
    172             <input>
    173                 <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server"
    174                     encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
    175             </input>
    176             <output>
    177                 <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server"
     170            <soap:operation soapAction="urn:PS/IPP/IData/Server/SOAP#find_instances" />
     171            <input>
     172                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
     173                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
     174            </input>
     175            <output>
     176                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
    178177                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
    179178            </output>
    180179        </operation>
    181180        <operation name="delete_instance">
    182             <soap:operation soapAction="urn:PS/IPP/IData/Server#delete_instance" />
    183             <input>
    184                 <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server"
    185                     encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
    186             </input>
    187             <output>
    188                 <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server"
     181            <soap:operation soapAction="urn:PS/IPP/IData/Server/SOAP#delete_instance" />
     182            <input>
     183                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
     184                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
     185            </input>
     186            <output>
     187                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
    189188                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
    190189            </output>
    191190        </operation>
    192191        <operation name="stat_object">
    193             <soap:operation soapAction="urn:PS/IPP/IData/Server#stat_object" />
    194             <input>
    195                 <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server"
    196                     encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
    197             </input>
    198             <output>
    199                 <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server"
     192            <soap:operation soapAction="urn:PS/IPP/IData/Server/SOAP#stat_object" />
     193            <input>
     194                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
     195                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
     196            </input>
     197            <output>
     198                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
    200199                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
    201200            </output>
    … …  
    204203
    205204
    206     <service name="PS/IPP/IData/Server">
    207         <port name="PS/IPP/IData/ServerPort" binding="tns:SOAP">
     205    <service name="PS/IPP/IData/Server/SOAP">
     206        <port name="PS/IPP/IData/Server/SOAPPort" binding="tns:SOAP">
    208207            <soap:address location="http://localhost:80/idata" />
    209208        </port>
Note: See TracChangeset for help on using the changeset viewer.