(file) Return to Constants.h CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/Constants.h between version 1.116 and 1.119

version 1.116, 2007/09/05 19:45:45 version 1.119, 2007/10/30 17:40:51
Line 173 
Line 173 
  */  */
  
 #define PEGASUS_DEFAULT_CLIENT_TIMEOUT_MILLISECONDS 20000 #define PEGASUS_DEFAULT_CLIENT_TIMEOUT_MILLISECONDS 20000
   #define PEGASUS_DEFAULT_SHUTDOWN_TIMEOUT_SECONDS_STRING "30"
 #define PEGASUS_DEFAULT_SOCKETWRITE_TIMEOUT_SECONDS 20 #define PEGASUS_DEFAULT_SOCKETWRITE_TIMEOUT_SECONDS 20
 #define PEGASUS_DEFAULT_SOCKETWRITE_TIMEOUT_SECONDS_STRING "20" #define PEGASUS_DEFAULT_SOCKETWRITE_TIMEOUT_SECONDS_STRING "20"
  
Line 209 
Line 210 
 #  define PEGASUS_CORE_DIR                  "/var/opt/wbem" #  define PEGASUS_CORE_DIR                  "/var/opt/wbem"
 #  define PEGASUS_PAM_STANDALONE_PROC_NAME  "/opt/wbem/lbin/cimservera" #  define PEGASUS_PAM_STANDALONE_PROC_NAME  "/opt/wbem/lbin/cimservera"
 #  define PEGASUS_PROVIDER_AGENT_PROC_NAME  "/opt/wbem/lbin/cimprovagt" #  define PEGASUS_PROVIDER_AGENT_PROC_NAME  "/opt/wbem/lbin/cimprovagt"
   #  define PEGASUS_DEFAULT_MESSAGE_SOURCE    \
       "/opt/wbem/share/locale/ICU_Messages"
 # elif defined(PEGASUS_OS_PASE) # elif defined(PEGASUS_OS_PASE)
 #  define PEGASUS_CIMSERVER_START_FILE      \ #  define PEGASUS_CIMSERVER_START_FILE      \
     "/QOpenSys/QIBM/UserData/UME/Pegasus/cimserver_start.conf"     "/QOpenSys/QIBM/UserData/UME/Pegasus/cimserver_start.conf"
Line 232 
Line 235 
     "/QOpenSys/QIBM/ProdData/UME/Pegasus/bin/cimservera"     "/QOpenSys/QIBM/ProdData/UME/Pegasus/bin/cimservera"
 #  define PEGASUS_PROVIDER_AGENT_PROC_NAME  \ #  define PEGASUS_PROVIDER_AGENT_PROC_NAME  \
     "/QOpenSys/QIBM/ProdData/UME/Pegasus/bin/cimprovagt"     "/QOpenSys/QIBM/ProdData/UME/Pegasus/bin/cimprovagt"
   #  undef PEGASUS_DEFAULT_MESSAGE_SOURCE     /* Not defined */
 # elif defined(PEGASUS_OS_AIX) # elif defined(PEGASUS_OS_AIX)
 #  define PEGASUS_CIMSERVER_START_FILE      "/tmp/cimserver_start.conf" #  define PEGASUS_CIMSERVER_START_FILE      "/tmp/cimserver_start.conf"
 #  define PEGASUS_CIMSERVER_START_LOCK_FILE \ #  define PEGASUS_CIMSERVER_START_LOCK_FILE \
Line 255 
Line 259 
     "/opt/freeware/cimom/pegasus/bin/cimservera"     "/opt/freeware/cimom/pegasus/bin/cimservera"
 #  define PEGASUS_PROVIDER_AGENT_PROC_NAME  \ #  define PEGASUS_PROVIDER_AGENT_PROC_NAME  \
     "/opt/freeware/cimom/pegasus/bin/cimprovagt"     "/opt/freeware/cimom/pegasus/bin/cimprovagt"
   #  define PEGASUS_DEFAULT_MESSAGE_SOURCE    "/opt/freeware/cimom/pegasus/msg"
 # elif defined(PEGASUS_OS_LINUX) # elif defined(PEGASUS_OS_LINUX)
 #  define PEGASUS_CIMSERVER_START_FILE      "/var/run/tog-pegasus/cimserver.pid" #  define PEGASUS_CIMSERVER_START_FILE      "/var/run/tog-pegasus/cimserver.pid"
 #  define PEGASUS_CIMSERVER_START_LOCK_FILE \ #  define PEGASUS_CIMSERVER_START_LOCK_FILE \
Line 274 
Line 279 
 #  define PEGASUS_CORE_DIR                  "/var/opt/tog-pegasus/cache" #  define PEGASUS_CORE_DIR                  "/var/opt/tog-pegasus/cache"
 #  define PEGASUS_PAM_STANDALONE_PROC_NAME  "/opt/tog-pegasus/sbin/cimservera" #  define PEGASUS_PAM_STANDALONE_PROC_NAME  "/opt/tog-pegasus/sbin/cimservera"
 #  define PEGASUS_PROVIDER_AGENT_PROC_NAME  "/opt/tog-pegasus/sbin/cimprovagt" #  define PEGASUS_PROVIDER_AGENT_PROC_NAME  "/opt/tog-pegasus/sbin/cimprovagt"
   #  undef PEGASUS_DEFAULT_MESSAGE_SOURCE     /* Not defined */
 # elif defined(PEGASUS_OS_VMS) # elif defined(PEGASUS_OS_VMS)
 #  define PEGASUS_CIMSERVER_START_FILE      \ #  define PEGASUS_CIMSERVER_START_FILE      \
     "/wbem_var/opt/wbem/cimserver_start.conf"     "/wbem_var/opt/wbem/cimserver_start.conf"
Line 291 
Line 297 
 #  define PEGASUS_LOCAL_AUTH_DIR            "/wbem_var/opt/wbem/localauth" #  define PEGASUS_LOCAL_AUTH_DIR            "/wbem_var/opt/wbem/localauth"
 #  undef PEGASUS_LOCAL_DOMAIN_SOCKET_PATH   /* Not used */ #  undef PEGASUS_LOCAL_DOMAIN_SOCKET_PATH   /* Not used */
 #  define PEGASUS_PROVIDER_AGENT_PROC_NAME  "/wbem_var/opt/wbem/bin/cimprovagt" #  define PEGASUS_PROVIDER_AGENT_PROC_NAME  "/wbem_var/opt/wbem/bin/cimprovagt"
   #  undef PEGASUS_DEFAULT_MESSAGE_SOURCE     /* Not defined */
 # elif defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) # elif defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)
 #  define PEGASUS_CIMSERVER_START_FILE      "/var/wbem/cimserver.pid" #  define PEGASUS_CIMSERVER_START_FILE      "/var/wbem/cimserver.pid"
 #  define PEGASUS_CIMSERVER_START_LOCK_FILE "/tmp/cimserver_start.lock"  #  define PEGASUS_CIMSERVER_START_LOCK_FILE "/var/wbem/cimserver_start.lock"
 #  define PEGASUS_REPOSITORY_DIR            "/var/wbem/repository" #  define PEGASUS_REPOSITORY_DIR            "/var/wbem/repository"
 #  define PEGASUS_CURRENT_CONFIG_FILE_PATH  "/etc/wbem/cimserver_current.conf" #  define PEGASUS_CURRENT_CONFIG_FILE_PATH  "/etc/wbem/cimserver_current.conf"
 #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  "/etc/wbem/cimserver_planned.conf" #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  "/etc/wbem/cimserver_planned.conf"
Line 304 
Line 311 
 #  define PEGASUS_LOCAL_DOMAIN_SOCKET_PATH  "/var/wbem/cimxml.socket" #  define PEGASUS_LOCAL_DOMAIN_SOCKET_PATH  "/var/wbem/cimxml.socket"
 #  undef PEGASUS_PAM_STANDALONE_PROC_NAME   /* Not used */ #  undef PEGASUS_PAM_STANDALONE_PROC_NAME   /* Not used */
 #  define PEGASUS_PROVIDER_AGENT_PROC_NAME  "bin/cimprovagt" #  define PEGASUS_PROVIDER_AGENT_PROC_NAME  "bin/cimprovagt"
   #  define PEGASUS_DEFAULT_MESSAGE_SOURCE    "/usr/lpp/wbem/msg"
 # elif defined(PEGASUS_OS_DARWIN) # elif defined(PEGASUS_OS_DARWIN)
 #  define PEGASUS_CIMSERVER_START_FILE      \ #  define PEGASUS_CIMSERVER_START_FILE      \
     "/var/cache/pegasus/cimserver_start.conf"     "/var/cache/pegasus/cimserver_start.conf"
Line 321 
Line 329 
 #  define PEGASUS_LOCAL_DOMAIN_SOCKET_PATH  "/tmp/cimxml.socket" #  define PEGASUS_LOCAL_DOMAIN_SOCKET_PATH  "/tmp/cimxml.socket"
 #  define PEGASUS_PAM_STANDALONE_PROC_NAME  "bin/cimservera" #  define PEGASUS_PAM_STANDALONE_PROC_NAME  "bin/cimservera"
 #  define PEGASUS_PROVIDER_AGENT_PROC_NAME  "bin/cimprovagt" #  define PEGASUS_PROVIDER_AGENT_PROC_NAME  "bin/cimprovagt"
   #  undef PEGASUS_DEFAULT_MESSAGE_SOURCE     /* Not defined */
 # endif # endif
 #endif #endif
 #else  // Not PEGASUS_USE_RELEASE_DIRS #else  // Not PEGASUS_USE_RELEASE_DIRS
Line 336 
Line 345 
 # define PEGASUS_LOCAL_DOMAIN_SOCKET_PATH  "/tmp/cimxml.socket" # define PEGASUS_LOCAL_DOMAIN_SOCKET_PATH  "/tmp/cimxml.socket"
 # define PEGASUS_PAM_STANDALONE_PROC_NAME  "bin/cimservera" # define PEGASUS_PAM_STANDALONE_PROC_NAME  "bin/cimservera"
 # define PEGASUS_PROVIDER_AGENT_PROC_NAME  "bin/cimprovagt" # define PEGASUS_PROVIDER_AGENT_PROC_NAME  "bin/cimprovagt"
   # undef PEGASUS_DEFAULT_MESSAGE_SOURCE      /* Not defined */
 #endif #endif
  
 /* Use the PID file as a semaphore for repository access */ /* Use the PID file as a semaphore for repository access */
 #define PEGASUS_REPOSITORY_LOCK_FILE PEGASUS_CIMSERVER_START_FILE #define PEGASUS_REPOSITORY_LOCK_FILE PEGASUS_CIMSERVER_START_FILE
  
 /* Constant defines for path to icu resource bundles */  
 #if defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)  
 # define PEGASUS_DEFAULT_MESSAGE_SOURCE  "/usr/lpp/wbem/msg"  
 #elif defined(PEGASUS_PLATFORM_AIX_RS_IBMCXX) && \  
       !defined(PEGASUS_DEFAULT_MESSAGE_SOURCE)  
 # define PEGASUS_DEFAULT_MESSAGE_SOURCE  "/opt/freeware/cimom/pegasus/msg"  
 #else  
 # undef PEGASUS_DEFAULT_MESSAGE_SOURCE  
 #endif  
   
 /* /*
  * Miscellaneous Constants  * Miscellaneous Constants
  */  */

Legend:
Removed from v.1.116  
changed lines
  Added in v.1.119
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2