Ignore:
Timestamp:
29/10/08 10:26:30 (12 years ago)
Author:
pjkersha
Message:

Renamed Attribute Authority classes and reran unittests

Location:
TI12-security/trunk/python/ndg.security.server/ndg/security/server/zsi
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/zsi/attributeauthority/__init__.py

    r4369 r4377  
    2626    import AttAuthorityService as _AttAuthorityService 
    2727 
    28 from ndg.security.server.attributeauthority import AttAuthority, \ 
    29     AttAuthorityAccessDenied 
     28from ndg.security.server.attributeauthority import AttributeAuthority, \ 
     29    AttributeAuthorityAccessDenied 
    3030     
    3131from ndg.security.common.wssecurity.dom import SignatureHandler 
     
    4747        # Initialise Attribute Authority class - property file will be 
    4848        # picked up from default location under $NDG_DIR directory 
    49         self.aa = AttAuthority(**kw) 
     49        self.aa = AttributeAuthority(**kw) 
    5050 
    5151 
     
    8585            response.AttCert = attCert.toString() 
    8686             
    87         except AttAuthorityAccessDenied, e: 
     87        except AttributeAuthorityAccessDenied, e: 
    8888            response.Msg = str(e) 
    8989             
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/zsi/twisted/attributeauthority/AttAuthority_services_server.py

    r4363 r4377  
    55################################################## 
    66 
    7 from ndg.security.common.AttAuthority.AttAuthority_services import * 
     7from ndg.security.common.zsi.attributeauthority.AttAuthority_services import * 
    88from ZSI.ServiceContainer import ServiceSOAPBinding 
    99 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/zsi/twisted/attributeauthority/attAuthority.tac

    r4369 r4377  
    4040        import AttAuthorityService 
    4141 
    42 from ndg.security.server.attributeauthority import AttAuthority, \ 
    43         AttAuthorityAccessDenied 
     42from ndg.security.server.attributeauthority import AttributeAuthority, \ 
     43        AttributeAuthorityAccessDenied 
    4444         
    4545from ndg.security.common.wssecurity.dom import SignatureHandler 
     
    5050 
    5151 
    52 class AttAuthorityServiceSub(AttAuthorityService, WSResource): 
     52class AttributeAuthorityServiceSub(AttributeAuthorityService, WSResource): 
    5353 
    5454    # Add WS-Security handlers 
     
    6868        # Initialize Attribute Authority class - property file will be 
    6969        # picked up from default location under $NDG_DIR directory 
    70         self.aa = AttAuthority() 
     70        self.aa = AttributeAuthority() 
    7171 
    7272 
     
    102102                response.AttCert = attCert.toString() 
    103103                 
    104         except AttAuthorityAccessDenied, e: 
     104        except AttributeAuthorityAccessDenied, e: 
    105105            response.Msg = str(e) 
    106106                         
     
    244244 
    245245# Create Service 
    246 srv = AttAuthorityServiceSub() 
     246srv = AttributeAuthorityServiceSub() 
    247247if srv.aa.has_key('WS-Security'): 
    248248    # Initialise WS-Security signature handler passing Attribute Authority 
Note: See TracChangeset for help on using the changeset viewer.