Ignore:
Timestamp:
16/07/07 16:20:24 (13 years ago)
Author:
pjkersha
Message:

ndg.security.server/ndg/security/server/AttAuthority/init.py,
ndg.security.server/ndg/security/server/ca/init.py,
ndg.security.server/ndg/security/server/SessionMgr/init.py,
ndg.security.common/ndg/security/common/Log/log_services_server.py:

  • replaced all refs to NDG_DIR environment variable with NDGSEC_DIR so that

it's specific to NDG security.

File:
1 edited

Legend:

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

    r2727 r2732  
    6868     
    6969    @type __confDir: string 
    70     @cvar __confDir: configuration directory under $NDG_DIR - default location 
     70    @cvar __confDir: configuration directory under $NDGSEC_DIR - default location 
    7171    for properties file  
    7272     
     
    116116        @keyword propFilePath: path to file containing Attribute Authority 
    117117        configuration parameters.  It defaults to $NDGSEC_AA_PROPFILEPATH or 
    118         if not set, $NDG_DIR/conf/attAuthorityProperties.xml 
     118        if not set, $NDGSEC_DIR/conf/attAuthorityProperties.xml 
    119119        @type bReadMapConfig: boolean 
    120120        @keyword bReadMapConfig: by default the Map Configuration file is  
     
    285285                val = os.environ['NDGSEC_AA_PROPFILEPATH'] 
    286286                 
    287             elif 'NDG_DIR' in os.environ: 
    288                 val = os.path.join(os.environ['NDG_DIR'],  
     287            elif 'NDGSEC_DIR' in os.environ: 
     288                val = os.path.join(os.environ['NDGSEC_DIR'],  
    289289                                   self.__class__.__confDir, 
    290290                                   self.__class__.__propFileName) 
     
    292292                raise AttributeError, 'Unable to set default Attribute ' + \ 
    293293                    'Authority properties file path: neither ' + \ 
    294                     '"NDGSEC_AA_PROPFILEPATH" or "NDG_DIR" environment ' + \ 
     294                    '"NDGSEC_AA_PROPFILEPATH" or "NDGSEC_DIR" environment ' + \ 
    295295                    'variables are set' 
    296296                 
Note: See TracChangeset for help on using the changeset viewer.