Changeset 3124


Ignore:
Timestamp:
06/12/07 14:49:00 (12 years ago)
Author:
pjkersha
Message:

security/python/ndg.security.test/ndg/security/test/wsSecurity/client: fixes to echoServer.py and echoClient.py for new stub names.

Location:
TI12-security/trunk/python/ndg.security.test/ndg/security/test/wsSecurity
Files:
1 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/wsSecurity/client/EchoService_services.py

    r3123 r3124  
    11##################################################  
    2 # Echo_services.py  
     2# EchoService_services.py  
    33# generated by ZSI.generate.wsdl2python 
    44################################################## 
    55 
    66 
    7 from Echo_services_types import * 
     7from EchoService_services_types import * 
    88import urlparse, types 
    99from ZSI.TCcompound import ComplexType, Struct 
     
    1313 
    1414# Locator 
    15 class EchoLocator: 
     15class EchoServiceLocator: 
    1616    Echo_address = "http://localhost:7100" 
    1717    def getEchoAddress(self): 
    18         return EchoLocator.Echo_address 
     18        return EchoServiceLocator.Echo_address 
    1919    def getEcho(self, url=None, **kw): 
    20         return EchoSOAP(url or EchoLocator.Echo_address, **kw) 
     20        return EchoBindingSOAP(url or EchoServiceLocator.Echo_address, **kw) 
    2121 
    2222# Methods 
    23 class EchoSOAP: 
     23class EchoBindingSOAP: 
    2424    def __init__(self, url, **kw): 
    2525        kw.setdefault("readerclass", None) 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/wsSecurity/client/EchoService_services_types.py

    r3123 r3124  
    11##################################################  
    2 # Echo_services_types.py  
     2# EchoService_services_types.py  
    33# generated by ZSI.generate.wsdl2python 
    44################################################## 
     
    1212############################## 
    1313# targetNamespace 
    14 # urn:ZSI:examples 
     14# urn:ndg:security:test:wssecurity 
    1515############################## 
    1616 
    1717class ns0: 
    18     targetNamespace = "urn:ZSI:examples" 
     18    targetNamespace = "urn:ndg:security:test:wssecurity" 
    1919 
    2020    class Echo_Dec(ZSI.TCcompound.ComplexType, ElementDeclaration): 
    2121        literal = "Echo" 
    22         schema = "urn:ZSI:examples" 
     22        schema = "urn:ndg:security:test:wssecurity" 
    2323        def __init__(self, **kw): 
    2424            ns = ns0.Echo_Dec.schema 
    2525            TClist = [ZSI.TC.String(pname=(ns,"EchoIn"), aname="_EchoIn", minOccurs=0, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))] 
    26             kw["pname"] = ("urn:ZSI:examples","Echo") 
     26            kw["pname"] = ("urn:ndg:security:test:wssecurity","Echo") 
    2727            kw["aname"] = "_Echo" 
    2828            self.attribute_typecode_dict = {} 
     
    4040    class EchoResponse_Dec(ZSI.TCcompound.ComplexType, ElementDeclaration): 
    4141        literal = "EchoResponse" 
    42         schema = "urn:ZSI:examples" 
     42        schema = "urn:ndg:security:test:wssecurity" 
    4343        def __init__(self, **kw): 
    4444            ns = ns0.EchoResponse_Dec.schema 
    4545            TClist = [ZSI.TC.String(pname=(ns,"EchoResult"), aname="_EchoResult", minOccurs=0, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))] 
    46             kw["pname"] = ("urn:ZSI:examples","EchoResponse") 
     46            kw["pname"] = ("urn:ndg:security:test:wssecurity","EchoResponse") 
    4747            kw["aname"] = "_EchoResponse" 
    4848            self.attribute_typecode_dict = {} 
     
    5858            self.pyclass = Holder 
    5959 
    60 # end class ns0 (tns: urn:ZSI:examples) 
     60# end class ns0 (tns: urn:ndg:security:test:wssecurity) 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/wsSecurity/client/echoClientTest.py

    r3122 r3124  
    44# 
    55# Import the client proxy object 
    6 from Echo_services import EchoLocator 
     6from EchoService_services import EchoServiceLocator 
    77 
    88import unittest 
     
    3535                                 caCertFilePathList=caCertFilePathList) 
    3636 
    37         locator = EchoLocator() 
     37        locator = EchoServiceLocator() 
    3838        self.clnt = locator.getEcho(uri,  
    3939                                    sig_handler=sigHandler, 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/wsSecurity/server/EchoService_services.py

    r3123 r3124  
    11##################################################  
    2 # Echo_services.py  
     2# EchoService_services.py  
    33# generated by ZSI.generate.wsdl2python 
    44################################################## 
    55 
    66 
    7 from Echo_services_types import * 
     7from EchoService_services_types import * 
    88import urlparse, types 
    99from ZSI.TCcompound import ComplexType, Struct 
     
    1313 
    1414# Locator 
    15 class EchoLocator: 
     15class EchoServiceLocator: 
    1616    Echo_address = "http://localhost:7100" 
    1717    def getEchoAddress(self): 
    18         return EchoLocator.Echo_address 
     18        return EchoServiceLocator.Echo_address 
    1919    def getEcho(self, url=None, **kw): 
    20         return EchoSOAP(url or EchoLocator.Echo_address, **kw) 
     20        return EchoBindingSOAP(url or EchoServiceLocator.Echo_address, **kw) 
    2121 
    2222# Methods 
    23 class EchoSOAP: 
     23class EchoBindingSOAP: 
    2424    def __init__(self, url, **kw): 
    2525        kw.setdefault("readerclass", None) 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/wsSecurity/server/EchoService_services_server.py

    r3123 r3124  
    11################################################## 
    2 # Echo_services_server.py 
     2# EchoService_services_server.py 
    33#      Generated by ZSI.generate.wsdl2dispatch.DelAuthServiceModuleWriter 
    44# 
    55################################################## 
    66 
    7 from ndg.security.test.wsSecurity.server.Echo_services import * 
     7from EchoService_services import * 
    88from ZSI.ServiceContainer import ServiceSOAPBinding 
    99 
    10 class Echo(ServiceSOAPBinding): 
     10class EchoService(ServiceSOAPBinding): 
    1111    soapAction = {} 
    1212    root = {} 
    1313    _wsdl = """<?xml version=\"1.0\" ?> 
    14 <definitions targetNamespace=\"urn:ZSI:examples\" xmlns=\"http://schemas.xmlsoap.org/wsdl/\" xmlns:http=\"http://schemas.xmlsoap.org/wsdl/http/\" xmlns:soap=\"http://schemas.xmlsoap.org/wsdl/soap/\" xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\" xmlns:tns=\"urn:ZSI:examples\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"> 
     14<definitions targetNamespace=\"urn:ndg:security:test:wssecurity\" xmlns=\"http://schemas.xmlsoap.org/wsdl/\" xmlns:http=\"http://schemas.xmlsoap.org/wsdl/http/\" xmlns:soap=\"http://schemas.xmlsoap.org/wsdl/soap/\" xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\" xmlns:tns=\"urn:ndg:security:test:wssecurity\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"> 
    1515  <types> 
    16   <xsd:schema elementFormDefault=\"qualified\" targetNamespace=\"urn:ZSI:examples\"> 
     16  <xsd:schema elementFormDefault=\"qualified\" targetNamespace=\"urn:ndg:security:test:wssecurity\"> 
    1717      <xsd:element name=\"Echo\"> 
    1818        <xsd:complexType> 
     
    4646  </portType> 
    4747 
    48   <binding name=\"Echo\" type=\"tns:Echo\"> 
     48  <binding name=\"EchoBinding\" type=\"tns:Echo\"> 
    4949    <soap:binding style=\"document\" transport=\"http://schemas.xmlsoap.org/soap/http\"/> 
    5050    <operation name=\"Echo\"> 
     
    5959  </binding> 
    6060 
    61   <service name=\"Echo\"> 
    62     <port binding=\"tns:Echo\" name=\"Echo\"> 
     61  <service name=\"EchoService\"> 
     62    <port binding=\"tns:EchoBinding\" name=\"Echo\"> 
    6363      <soap:address location=\"http://localhost:7100\"/> 
    6464    </port> 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/wsSecurity/server/EchoService_services_types.py

    r3123 r3124  
    11##################################################  
    2 # Echo_services_types.py  
     2# EchoService_services_types.py  
    33# generated by ZSI.generate.wsdl2python 
    44################################################## 
     
    1212############################## 
    1313# targetNamespace 
    14 # urn:ZSI:examples 
     14# urn:ndg:security:test:wssecurity 
    1515############################## 
    1616 
    1717class ns0: 
    18     targetNamespace = "urn:ZSI:examples" 
     18    targetNamespace = "urn:ndg:security:test:wssecurity" 
    1919 
    2020    class Echo_Dec(ZSI.TCcompound.ComplexType, ElementDeclaration): 
    2121        literal = "Echo" 
    22         schema = "urn:ZSI:examples" 
     22        schema = "urn:ndg:security:test:wssecurity" 
    2323        def __init__(self, **kw): 
    2424            ns = ns0.Echo_Dec.schema 
    2525            TClist = [ZSI.TC.String(pname=(ns,"EchoIn"), aname="_EchoIn", minOccurs=0, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))] 
    26             kw["pname"] = ("urn:ZSI:examples","Echo") 
     26            kw["pname"] = ("urn:ndg:security:test:wssecurity","Echo") 
    2727            kw["aname"] = "_Echo" 
    2828            self.attribute_typecode_dict = {} 
     
    4040    class EchoResponse_Dec(ZSI.TCcompound.ComplexType, ElementDeclaration): 
    4141        literal = "EchoResponse" 
    42         schema = "urn:ZSI:examples" 
     42        schema = "urn:ndg:security:test:wssecurity" 
    4343        def __init__(self, **kw): 
    4444            ns = ns0.EchoResponse_Dec.schema 
    4545            TClist = [ZSI.TC.String(pname=(ns,"EchoResult"), aname="_EchoResult", minOccurs=0, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))] 
    46             kw["pname"] = ("urn:ZSI:examples","EchoResponse") 
     46            kw["pname"] = ("urn:ndg:security:test:wssecurity","EchoResponse") 
    4747            kw["aname"] = "_EchoResponse" 
    4848            self.attribute_typecode_dict = {} 
     
    5858            self.pyclass = Holder 
    5959 
    60 # end class ns0 (tns: urn:ZSI:examples) 
     60# end class ns0 (tns: urn:ndg:security:test:wssecurity) 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/wsSecurity/server/echoServer.py

    r3123 r3124  
    1212from ZSI.ServiceContainer import GetSOAPContext 
    1313 
    14 from ndg.security.test.wsSecurity.server.Echo_services_server import \ 
    15     Echo as _Echo 
     14from ndg.security.test.wsSecurity.server.EchoService_services_server import \ 
     15    EchoService as _EchoService 
    1616 
    1717from ndg.security.common import wsSecurity 
     
    2222caCertFilePath = './cacert.pem' 
    2323 
    24 class Echo(_Echo): 
     24class EchoService(_EchoService): 
    2525 
    2626    def __init__(self, **kw): 
     
    3838                                    signingPriKeyPwd=priKeyPwd, 
    3939                                    caCertFilePathList=[caCertFilePath]) 
    40         _Echo.__init__(self, **kw) 
     40        _EchoService.__init__(self, **kw) 
    4141         
    4242    def sign(self, sw): 
     
    6262            pdb.set_trace() 
    6363         
    64         response = _Echo.soap_Echo(self, ps)     
     64        response = _EchoService.soap_Echo(self, ps)     
    6565        response.EchoResult = "Received message from client: " + \ 
    6666                            self.request.EchoIn 
     
    8484     
    8585    # Create the Inherited version of the server 
    86     echo = Echo(tracefile=sys.stdout) 
     86    echo = EchoService(tracefile=sys.stdout) 
    8787    serviceContainer.setNode(echo, url=path) 
    8888     
Note: See TracChangeset for help on using the changeset viewer.