Changeset 4369


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

Move ndg.security.server Session Manager and Attribute Authority back into top-level modules from their sub-package placings

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

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/Tests/pylonsAttributeAuthority/ndgsecurity/ndgsecurity/config/attributeauthority.py

    r4138 r4369  
    55 
    66 
    7 from ndg.security.server.AttAuthority.AttAuthority_services_server import \ 
     7from ndg.security.server.attributeauthority.AttAuthority_services_server import \ 
    88        AttAuthorityService as _AttAuthorityService 
    99 
    10 from ndg.security.server.AttAuthority import AttAuthority, \ 
     10from ndg.security.server.attributeauthority import AttAuthority, \ 
    1111        AttAuthorityAccessDenied 
    1212         
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/CredWallet.py

    r4320 r4369  
    4141# no need to import it 
    4242try: 
    43     from ndg.security.server.AttAuthority import AttAuthority, \ 
     43    from ndg.security.server.attributeauthority import AttAuthority, \ 
    4444        AttAuthorityError, AttAuthorityAccessDenied 
    4545    aaImportError = False 
     
    178178    details. (property attribute) 
    179179     
    180     @type attributeAuthority: ndg.security.server.AttAuthority.AttAuthority 
     180    @type attributeAuthority: ndg.security.server.attributeauthority.AttAuthority 
    181181    @ivar attributeAuthority: Attribute Authority to make requests to.   
    182182    attributeAuthorityURI takes precedence over this keyword i.e. if an 
     
    825825        attributeAuthorityClnt 
    826826         
    827         @rtype attributeAuthority: ndg.security.server.AttAuthority.AttAuthority 
     827        @rtype attributeAuthority: ndg.security.server.attributeauthority.AttAuthority 
    828828        @return attributeAuthority: Attribute Authority instance""" 
    829829        return self._attributeAuthority 
     
    833833        connect to. 
    834834         
    835         @type attributeAuthority: ndg.security.server.AttAuthority.AttAuthority 
     835        @type attributeAuthority: ndg.security.server.attributeauthority.AttAuthority 
    836836        @param attributeAuthority: Attribute Authority instance.""" 
    837837        if attributeAuthority is not None and \ 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/authnservice/basicauthn.py

    r4320 r4369  
    1717import hashlib 
    1818 
    19 from ndg.security.server.SessionMgr import SessionMgr, AbstractAuthNService, \ 
    20     AuthNServiceInvalidCredentials, AuthNServiceError 
     19from ndg.security.server.sessionmanager import SessionMgr, \ 
     20    AbstractAuthNService, AuthNServiceInvalidCredentials, AuthNServiceError 
    2121from ndg.security.common.myproxy import MyProxyClient 
    2222 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/authnservice/myproxyauthn.py

    r4318 r4369  
    1414__revision__ = '$Id: $' 
    1515 
    16 from ndg.security.server.SessionMgr import AbstractAuthNService 
     16from ndg.security.server.sessionmanager import AbstractAuthNService 
    1717from ndg.security.common.myproxy import MyProxyClient 
    1818 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/conf/userRoles.py

    r2927 r4369  
    1414 
    1515 
    16 from ndg.security.server.AttAuthority import AAUserRoles 
     16from ndg.security.server.attributeauthority import AAUserRoles 
    1717 
    1818 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/zsi/attributeauthority/__init__.py

    r4285 r4369  
    1010__contact__ = "P.J.Kershaw@rl.ac.uk" 
    1111__revision__ = '$Id$' 
    12 import os, sys 
     12import os 
     13import sys 
    1314import base64 
    1415import logging 
     
    2526    import AttAuthorityService as _AttAuthorityService 
    2627 
    27 from ndg.security.server.AttAuthority import AttAuthority, \ 
     28from ndg.security.server.attributeauthority import AttAuthority, \ 
    2829    AttAuthorityAccessDenied 
    2930     
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/zsi/sessionmanager/__init__.py

    r4265 r4369  
    1919    import SessionMgrService as _SessionMgrService 
    2020 
    21 from ndg.security.server.SessionMgr import SessionMgr 
     21from ndg.security.server.sessionmanager import SessionMgr 
    2222     
    2323from ndg.security.common.wssecurity.dom import SignatureHandler 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/zsi/twisted/attributeauthority/attAuthority.tac

    r4365 r4369  
    3636from twisted.web.resource import Resource 
    3737 
    38 from ndg.security.server.AttAuthority.AttAuthority_services_server import \ 
    39         AttAuthorityService 
    40  
    41 from ndg.security.server.AttAuthority import AttAuthority, \ 
     38from \ 
     39ndg.security.server.zsi.twisted.attributeauthority.AttAuthority_services_server\ 
     40        import AttAuthorityService 
     41 
     42from ndg.security.server.attributeauthority import AttAuthority, \ 
    4243        AttAuthorityAccessDenied 
    4344         
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/zsi/twisted/sessionmanager/sessionMgr.tac

    r4365 r4369  
    3939from twisted.web.resource import Resource 
    4040 
    41 from ndg.security.server.SessionMgr.SessionMgr_services_server import \ 
    42         SessionMgrService as _SessionMgrService 
    43 from ndg.security.server.SessionMgr import SessionMgr 
     41from ndg.security.server.zsi.twisted.sessionmanager.SessionMgr_services_server\ 
     42        import SessionMgrService as _SessionMgrService 
     43from ndg.security.server.sessionmanager import SessionMgr 
    4444from ndg.security.common.wssecurity.dom import SignatureHandler 
    4545from ndg.security.server.zsi.twisted import WSSecurityHandler, \ 
  • TI12-security/trunk/python/ndg.security.server/setup.py

    r4308 r4369  
    9191        # instead of a package 
    9292        'ndg.security.server.share': ['*'], 
    93         'ndg.security.server.AttAuthority': ['*.sh'], 
    94         'ndg.security.server.SessionMgr': ['*.sh'], 
     93        'ndg.security.server.attributeauthority': ['*.sh'], 
     94        'ndg.security.server.sessionmanager': ['*.sh'], 
    9595        'ndg.security.server.ca': ['*.sh'], 
    9696        'ndg.security.server.sso': ['*.ini', '*.cfg', '*.txt'], 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/attAuthority/siteAUserRoles.py

    r2909 r4369  
    1414 
    1515 
    16 from ndg.security.server.AttAuthority import AAUserRoles 
     16from ndg.security.server.attributeauthority import AAUserRoles 
    1717 
    1818 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/attAuthority/siteBUserRoles.py

    r2909 r4369  
    1414 
    1515 
    16 from ndg.security.server.AttAuthority import AAUserRoles 
     16from ndg.security.server.attributeauthority import AAUserRoles 
    1717 
    1818 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/authnservice/test_authnservice.py

    r4328 r4369  
    1313__revision__ = '$Id: $' 
    1414 
    15 from ndg.security.server.SessionMgr import AbstractAuthNService 
     15from ndg.security.server.sessionmanager import AbstractAuthNService 
    1616 
    1717import logging, os, sys 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/sessionmanager/test_sessionMgr.py

    r4321 r4369  
    2323                                                    CaseSensitiveConfigParser 
    2424from ndg.security.common.X509 import X509CertParse 
    25 from ndg.security.server.SessionMgr import * 
     25from ndg.security.server.sessionmanager import * 
    2626 
    2727from os.path import expandvars as xpdVars 
     
    3434 
    3535class SessionMgrTestCase(unittest.TestCase): 
    36     """Unit test case for ndg.security.server.SessionMgr.SessionMgr class. 
     36    """Unit test case for ndg.security.server.sessionmanager.SessionMgr class. 
    3737     
    3838    This class manages server side sessions""" 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/utils/testConfigFileParsers.py

    r4139 r4369  
    77import unittest, os 
    88from ndg.security.common.utils.ConfigFileParsers import readProperties, readAndValidateProperties 
    9 from ndg.security.server.AttAuthority import AttAuthority 
    10 from ndg.security.server.SessionMgr import SessionMgr 
     9from ndg.security.server.attributeauthority import AttAuthority 
     10from ndg.security.server.sessionmanager import SessionMgr 
    1111from ConfigParser import MissingSectionHeaderError 
    1212 
Note: See TracChangeset for help on using the changeset viewer.