Changeset 4387 for TI12-security


Ignore:
Timestamp:
29/10/08 11:31:08 (11 years ago)
Author:
pjkersha
Message:

Update to WSDL stubs

Location:
TI12-security/trunk/python
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/sessionmanager.py

    r4384 r4387  
    1313__contact__ = "P.J.Kershaw@rl.ac.uk" 
    1414__revision__ = "$Id:sessionmanager.py 4373 2008-10-29 09:54:39Z pjkersha $" 
    15 __all__ = ['SessionMgr_services', 'SessionMgr_services_types'] 
     15__all__ = ['SessionManager_services', 'SessionManager_services_types'] 
    1616 
    1717import sys 
     
    2929    HostCheck 
    3030from ndg.security.common.zsi.httpproxy import ProxyHTTPConnection 
    31 from ndg.security.common.zsi.sessionmanager.SessionMgr_services import \ 
    32                                                     SessionMgrServiceLocator 
     31from ndg.security.common.zsi.sessionmanager.SessionManager_services import \ 
     32                                                    SessionManagerServiceLocator 
    3333 
    3434import logging 
     
    341341        # WS-Security Signature handler object is passed to binding 
    342342        try: 
    343             locator = SessionMgrServiceLocator() 
    344             self.__srv = locator.getSessionMgr(self.__uri, 
     343            locator = SessionManagerServiceLocator() 
     344            self.__srv = locator.getSessionManager(self.__uri, 
    345345                                         sig_handler=self.__signatureHandler, 
    346346                                         tracefile=self.__tracefile, 
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/zsi/twisted/sessionmanager/SessionMgr_services.py

    r4361 r4387  
    11##################################################  
    2 # SessionMgr_services.py  
     2# SessionManager_services.py  
    33# generated by ZSI.generate.wsdl2python 
    44################################################## 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/zsi/sessionmanager/__init__.py

    r4384 r4387  
    1616 
    1717 
    18 from ndg.security.server.zsi.sessionmanager.SessionMgr_services_server \ 
    19     import SessionMgrService as _SessionMgrService 
     18from ndg.security.server.zsi.sessionmanager.SessionManager_services_server \ 
     19    import SessionManagerService as _SessionManagerService 
    2020 
    2121from ndg.security.server.sessionmanager import SessionManager 
     
    2525 
    2626 
    27 class SessionManagerWS(_SessionMgrService): 
     27class SessionManagerWS(_SessionManagerService): 
    2828    '''Session Manager ZSI SOAP Service Binding class''' 
    2929     
     
    5454            pdb.set_trace() 
    5555             
    56         response = _SessionMgrService.soap_connect(self, ps) 
     56        response = _SessionManagerService.soap_connect(self, ps) 
    5757         
    5858        result = self.sm.connect(username=request.Username, 
     
    7777            pdb.set_trace() 
    7878                         
    79         response = _SessionMgrService.soap_disconnect(self, ps) 
     79        response = _SessionManagerService.soap_disconnect(self, ps) 
    8080         
    8181        # Derive designated user ID differently according to whether 
     
    114114            pdb.set_trace() 
    115115             
    116         response = _SessionMgrService.soap_getSessionStatus(self, ps) 
     116        response = _SessionManagerService.soap_getSessionStatus(self, ps) 
    117117         
    118118        response.IsAlive = self.sm.getSessionStatus(userDN=request.UserDN, 
     
    134134            pdb.set_trace() 
    135135             
    136         response = _SessionMgrService.soap_getAttCert(self, ps) 
     136        response = _SessionManagerService.soap_getAttCert(self, ps) 
    137137 
    138138        # Derive designated holder cert differently according to whether 
     
    183183            pdb.set_trace() 
    184184             
    185         response = _SessionMgrService.soap_getX509Cert(self, ps) 
     185        response = _SessionManagerService.soap_getX509Cert(self, ps) 
    186186 
    187187        x509Cert = X509CertRead(srv.sm['signingCertFilePath']) 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/zsi/twisted/sessionmanager/sessionMgr.tac

    r4384 r4387  
    3939from twisted.web.resource import Resource 
    4040 
    41 from ndg.security.server.zsi.twisted.sessionmanager.SessionMgr_services_server\ 
    42         import SessionMgrService as _SessionMgrService 
     41from ndg.security.server.zsi.twisted.sessionmanager.SessionManager_services_server\ 
     42        import SessionManagerService as _SessionManagerService 
    4343from ndg.security.server.sessionmanager import SessionManager 
    4444from ndg.security.common.wssecurity.dom import SignatureHandler 
     
    5050 
    5151 
    52 class SessionManagerService(_SessionMgrService, WSResource): 
     52class SessionManagerService(_SessionManagerService, WSResource): 
    5353 
    5454    # Add WS-Security handlers 
     
    8787                pdb.set_trace() 
    8888                 
    89         request, response = _SessionMgrService.soap_connect(self, ps) 
     89        request, response = _SessionManagerService.soap_connect(self, ps) 
    9090         
    9191        result = self.sm.connect(username=request.Username, 
     
    110110                pdb.set_trace() 
    111111                             
    112         request, response = _SessionMgrService.soap_disconnect(self, ps) 
     112        request, response = _SessionManagerService.soap_disconnect(self, ps) 
    113113         
    114114        # Derive designated user ID differently according to whether 
     
    140140                pdb.set_trace() 
    141141                 
    142         request, response = _SessionMgrService.soap_getSessionStatus(self, ps) 
     142        request, response = _SessionManagerService.soap_getSessionStatus(self, ps) 
    143143         
    144144        response.IsAlive = self.sm.getSessionStatus(userDN=request.UserDN, 
     
    160160                pdb.set_trace() 
    161161                 
    162         request, response = _SessionMgrService.soap_getAttCert(self, ps) 
     162        request, response = _SessionManagerService.soap_getAttCert(self, ps) 
    163163 
    164164        # Get certificate corresponding to private key that signed the 
     
    203203                pdb.set_trace() 
    204204                 
    205         request, response = _SessionMgrService.soap_getX509Cert(self, ps) 
     205        request, response = _SessionManagerService.soap_getX509Cert(self, ps) 
    206206 
    207207        x509Cert = X509CertRead(srv.sm['signingCertFilePath']) 
Note: See TracChangeset for help on using the changeset viewer.