Ignore:
Timestamp:
04/03/09 11:42:23 (11 years ago)
Author:
pjkersha
Message:

Updated imports for new location of signature handlers in ndg.security.common.wssecurity.signaturehandler. Re-ran Java Attribute Authority client unit tests against updated Attribute Authority WSGI based service.

Location:
TI12-security/trunk/python/ndg.security.common/ndg/security/common
Files:
6 edited

Legend:

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

    r4840 r5063  
    2929from ndg.security.common.zsi.attributeauthority.AttributeAuthority_services \ 
    3030    import AttributeAuthorityServiceLocator 
    31 from ndg.security.common.wssecurity.dom import SignatureHandler 
     31from ndg.security.common.wssecurity.signaturehandler.dom import SignatureHandler 
    3232from ndg.security.common.AttCert import AttCert, AttCertParse 
    3333from ndg.security.common.m2CryptoSSLUtility import HTTPSConnection, HostCheck 
     
    245245            raise AttributeError("Signature Handler must be %s type or None " 
    246246                                 "for no message security" %  
    247                         "ndg.security.common.wssecurity.dom.SignatureHandler") 
     247                        "ndg.security.common.wssecurity.signaturehandler.dom.SignatureHandler") 
    248248                             
    249249        self.__signatureHandler = signatureHandler 
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/credentialwallet.py

    r4840 r5063  
    5858# Authorisation - attribute certificate  
    5959from ndg.security.common.AttCert import * 
    60 from ndg.security.common.wssecurity.dom import SignatureHandler 
     60from ndg.security.common.wssecurity.signaturehandler.dom import SignatureHandler 
    6161 
    6262# generic parser to read INI/XML properties file 
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/sessionmanager.py

    r4855 r5063  
    2323from ZSI.wstools.Utility import HTTPResponse 
    2424 
    25 from ndg.security.common.wssecurity.dom import SignatureHandler 
     25from ndg.security.common.wssecurity.signaturehandler.dom import SignatureHandler 
    2626from ndg.security.common.X509 import * 
    2727from ndg.security.common.AttCert import AttCert, AttCertParse 
     
    312312            raise AttributeError("Signature Handler must be %s type or None " 
    313313                                 "for no message security" % 
    314                         "ndg.security.common.wssecurity.dom.SignatureHandler") 
     314                        "ndg.security.common.wssecurity.signaturehandler.dom.SignatureHandler") 
    315315                             
    316316        self.__signatureHandler = signatureHandler 
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/wssecurity/signaturehandler/dom.py

    r5062 r5063  
    6969log = logging.getLogger(__name__) 
    7070 
    71 from BaseSignatureHandler import _ENCRYPTION, _WSU, OASIS, \ 
    72     BaseSignatureHandler, WSSecurityError, NoSignatureFound, InvalidSignature,\ 
    73     TimestampError, VerifyError, SignatureError 
     71from ndg.security.common.wssecurity.signaturehandler import _ENCRYPTION, \ 
     72    _WSU, OASIS, BaseSignatureHandler, WSSecurityError, NoSignatureFound, \ 
     73    InvalidSignature, TimestampError, VerifyError, SignatureError 
    7474 
    7575# Enable settings from a config file 
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/wssecurity/signaturehandler/etree.py

    r5062 r5063  
    1010__revision__ = '$Id:  $' 
    1111 
    12 from BaseSignatureHandler import _WSU, OASIS, BaseSignatureHandler 
    1312import re 
    1413 
     
    5857# Enable settings from a config file 
    5958from ndg.security.common.wssecurity import WSSecurityConfig 
     59 
     60from ndg.security.common.wssecurity.signaturehandler import _WSU, OASIS, \ 
     61    BaseSignatureHandler 
    6062 
    6163# Check SoapWriter.dom attribute is ElementTreeProxy type 
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/wssecurity/signaturehandler/foursuite.py

    r5062 r5063  
    3535from Ft.Xml.Domlette import CanonicalPrint 
    3636 
    37 from BaseSignatureHandler import _WSU, OASIS, BaseSignatureHandler, \ 
    38     WSSecurityError, NoSignatureFound, InvalidSignature, TimestampError, \ 
    39     VerifyError, SignatureError 
     37from ndg.security.common.wssecurity.signaturehandler import _ENCRYPTION, \ 
     38    _WSU, OASIS, BaseSignatureHandler, WSSecurityError, NoSignatureFound, \ 
     39    InvalidSignature, TimestampError, VerifyError, SignatureError 
    4040 
    4141# Enable settings from a config file 
Note: See TracChangeset for help on using the changeset viewer.