(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.110 and 1.111

version 1.110, 2007/06/22 17:35:52 version 1.111, 2007/06/22 17:45:51
Line 194 
Line 194 
 # include <Pegasus/Common/ProductDirectoryStructure.h> # include <Pegasus/Common/ProductDirectoryStructure.h>
 #else #else
 # if defined(PEGASUS_OS_HPUX) # if defined(PEGASUS_OS_HPUX)
 #  undef CIMSERVER_LOCK_FILE  #  undef PEGASUS_CIMSERVER_START_FILE
 #  define CIMSERVER_LOCK_FILE               "/var/opt/wbem/cimserver_start.lock"  #  define PEGASUS_CIMSERVER_START_FILE      "/etc/opt/wbem/cimserver_start.conf"
   #  undef PEGASUS_CIMSERVER_START_LOCK_FILE
   #  define PEGASUS_CIMSERVER_START_LOCK_FILE "/var/opt/wbem/cimserver_start.lock"
 #  undef PEGASUS_REPOSITORY_DIR #  undef PEGASUS_REPOSITORY_DIR
 #  define PEGASUS_REPOSITORY_DIR            "/var/opt/wbem/repository" #  define PEGASUS_REPOSITORY_DIR            "/var/opt/wbem/repository"
 #  undef PEGASUS_CURRENT_CONFIG_FILE_PATH #  undef PEGASUS_CURRENT_CONFIG_FILE_PATH
Line 204 
Line 206 
 #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH
 #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  \ #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  \
     "/var/opt/wbem/cimserver_planned.conf"     "/var/opt/wbem/cimserver_planned.conf"
 #  undef PEGASUS_CIMSERVER_START_FILE  
 #  define PEGASUS_CIMSERVER_START_FILE      "/etc/opt/wbem/cimserver_start.conf"  
 #  undef PEGASUS_SSLCLIENT_CERTIFICATEFILE #  undef PEGASUS_SSLCLIENT_CERTIFICATEFILE
 #  define PEGASUS_SSLCLIENT_CERTIFICATEFILE "/etc/opt/hp/sslshare/client.pem" #  define PEGASUS_SSLCLIENT_CERTIFICATEFILE "/etc/opt/hp/sslshare/client.pem"
 #  undef PEGASUS_SSLCLIENT_RANDOMFILE #  undef PEGASUS_SSLCLIENT_RANDOMFILE
Line 223 
Line 223 
 #  undef PEGASUS_PROVIDER_AGENT_PROC_NAME #  undef PEGASUS_PROVIDER_AGENT_PROC_NAME
 #  define PEGASUS_PROVIDER_AGENT_PROC_NAME  "/opt/wbem/lbin/cimprovagt" #  define PEGASUS_PROVIDER_AGENT_PROC_NAME  "/opt/wbem/lbin/cimprovagt"
 # elif defined(PEGASUS_OS_AIX) # elif defined(PEGASUS_OS_AIX)
 #  undef CIMSERVER_LOCK_FILE  #  undef PEGASUS_CIMSERVER_START_FILE
 #  define CIMSERVER_LOCK_FILE               \  #  define PEGASUS_CIMSERVER_START_FILE      "/tmp/cimserver_start.conf"
   #  undef PEGASUS_CIMSERVER_START_LOCK_FILE
   #  define PEGASUS_CIMSERVER_START_LOCK_FILE \
     "/opt/freeware/cimom/pegasus/etc/cimserver_start.lock"     "/opt/freeware/cimom/pegasus/etc/cimserver_start.lock"
 #  undef PEGASUS_REPOSITORY_DIR #  undef PEGASUS_REPOSITORY_DIR
 #  define PEGASUS_REPOSITORY_DIR            \ #  define PEGASUS_REPOSITORY_DIR            \
Line 235 
Line 237 
 #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH
 #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  \ #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  \
     "/opt/freeware/cimom/pegasus/etc/cimserver_planned.conf"     "/opt/freeware/cimom/pegasus/etc/cimserver_planned.conf"
 #  undef PEGASUS_CIMSERVER_START_FILE  
 #  define PEGASUS_CIMSERVER_START_FILE      "/tmp/cimserver_start.conf"  
 #  undef PEGASUS_SSLCLIENT_CERTIFICATEFILE #  undef PEGASUS_SSLCLIENT_CERTIFICATEFILE
 #  define PEGASUS_SSLCLIENT_CERTIFICATEFILE \ #  define PEGASUS_SSLCLIENT_CERTIFICATEFILE \
     "/opt/freeware/cimom/pegasus/etc/client.pem"     "/opt/freeware/cimom/pegasus/etc/client.pem"
Line 253 
Line 253 
 #  define PEGASUS_PAM_STANDALONE_PROC_NAME  \ #  define PEGASUS_PAM_STANDALONE_PROC_NAME  \
     "/opt/freeware/cimom/pegasus/bin/cimservera"     "/opt/freeware/cimom/pegasus/bin/cimservera"
 # elif defined(PEGASUS_OS_LINUX) # elif defined(PEGASUS_OS_LINUX)
 #  undef CIMSERVER_LOCK_FILE  #  undef PEGASUS_CIMSERVER_START_FILE
 #  define CIMSERVER_LOCK_FILE               \  #  define PEGASUS_CIMSERVER_START_FILE      "/var/run/tog-pegasus/cimserver.pid"
     "/var/opt/tog-pegasus/cimserver_start.lock"  #  undef PEGASUS_CIMSERVER_START_LOCK_FILE
   #  define PEGASUS_CIMSERVER_START_LOCK_FILE \
       "/var/run/tog-pegasus/cimserver_start.lock"
 #  undef PEGASUS_REPOSITORY_DIR #  undef PEGASUS_REPOSITORY_DIR
 #  define PEGASUS_REPOSITORY_DIR            "/var/opt/tog-pegasus/repository" #  define PEGASUS_REPOSITORY_DIR            "/var/opt/tog-pegasus/repository"
 #  undef PEGASUS_CURRENT_CONFIG_FILE_PATH #  undef PEGASUS_CURRENT_CONFIG_FILE_PATH
Line 264 
Line 266 
 #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH
 #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  \ #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  \
     "/var/opt/tog-pegasus/cimserver_planned.conf"     "/var/opt/tog-pegasus/cimserver_planned.conf"
 #  undef PEGASUS_CIMSERVER_START_FILE  
 #  define PEGASUS_CIMSERVER_START_FILE      "/var/run/tog-pegasus/cimserver.pid"  
 #  undef PEGASUS_SSLCLIENT_CERTIFICATEFILE #  undef PEGASUS_SSLCLIENT_CERTIFICATEFILE
 #  define PEGASUS_SSLCLIENT_CERTIFICATEFILE "/etc/opt/tog-pegasus/client.pem" #  define PEGASUS_SSLCLIENT_CERTIFICATEFILE "/etc/opt/tog-pegasus/client.pem"
 #  undef PEGASUS_SSLCLIENT_RANDOMFILE #  undef PEGASUS_SSLCLIENT_RANDOMFILE
Line 285 
Line 285 
 #  undef PEGASUS_PROVIDER_AGENT_PROC_NAME #  undef PEGASUS_PROVIDER_AGENT_PROC_NAME
 #  define PEGASUS_PROVIDER_AGENT_PROC_NAME  "/opt/tog-pegasus/sbin/cimprovagt" #  define PEGASUS_PROVIDER_AGENT_PROC_NAME  "/opt/tog-pegasus/sbin/cimprovagt"
 # elif defined(PEGASUS_OS_VMS) # elif defined(PEGASUS_OS_VMS)
 #  undef CIMSERVER_LOCK_FILE  #  undef PEGASUS_CIMSERVER_START_FILE
 #  define CIMSERVER_LOCK_FILE               \  #  define PEGASUS_CIMSERVER_START_FILE      \
       "/wbem_var/opt/wbem/cimserver_start.conf"
   #  undef PEGASUS_CIMSERVER_START_LOCK_FILE
   #  define PEGASUS_CIMSERVER_START_LOCK_FILE \
     "/wbem_var/opt/wbem/cimserver_start.lock"     "/wbem_var/opt/wbem/cimserver_start.lock"
 #  undef PEGASUS_REPOSITORY_DIR #  undef PEGASUS_REPOSITORY_DIR
 #  define PEGASUS_REPOSITORY_DIR            "/wbem_var/opt/wbem/repository" #  define PEGASUS_REPOSITORY_DIR            "/wbem_var/opt/wbem/repository"
Line 296 
Line 299 
 #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH
 #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  \ #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  \
     "/wbem_var/opt/wbem/cimserver_planned.conf"     "/wbem_var/opt/wbem/cimserver_planned.conf"
 #  undef PEGASUS_CIMSERVER_START_FILE  
 #  define PEGASUS_CIMSERVER_START_FILE      \  
     "/wbem_var/opt/wbem/cimserver_start.conf"  
 #  undef PEGASUS_SSLCLIENT_CERTIFICATEFILE #  undef PEGASUS_SSLCLIENT_CERTIFICATEFILE
 #  define PEGASUS_SSLCLIENT_CERTIFICATEFILE \ #  define PEGASUS_SSLCLIENT_CERTIFICATEFILE \
     "/wbem_etc/opt/hp/sslshare/client.pem"     "/wbem_etc/opt/hp/sslshare/client.pem"
Line 323 
Line 323 
 #  undef PEGASUS_LOCAL_DOMAIN_SOCKET_PATH #  undef PEGASUS_LOCAL_DOMAIN_SOCKET_PATH
 #  define PEGASUS_LOCAL_DOMAIN_SOCKET_PATH  "/var/wbem/cimxml.socket" #  define PEGASUS_LOCAL_DOMAIN_SOCKET_PATH  "/var/wbem/cimxml.socket"
 # elif defined(PEGASUS_OS_DARWIN) # elif defined(PEGASUS_OS_DARWIN)
   #  undef PEGASUS_CIMSERVER_START_FILE
   #  define PEGASUS_CIMSERVER_START_FILE      \
       "/var/cache/pegasus/cimserver_start.conf"
   #  undef PEGASUS_CIMSERVER_START_LOCK_FILE
   #  define PEGASUS_CIMSERVER_START_LOCK_FILE      \
       "/var/cache/pegasus/cimserver_start.lock"
 #  undef PEGASUS_CURRENT_CONFIG_FILE_PATH #  undef PEGASUS_CURRENT_CONFIG_FILE_PATH
 #  define PEGASUS_CURRENT_CONFIG_FILE_PATH  \ #  define PEGASUS_CURRENT_CONFIG_FILE_PATH  \
     "/etc/pegasus/cimserver_current.conf"     "/etc/pegasus/cimserver_current.conf"
 #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH
 #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  \ #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  \
     "/etc/pegasus/cimserver_planned.conf"     "/etc/pegasus/cimserver_planned.conf"
 #  undef PEGASUS_CIMSERVER_START_FILE  
 #  define PEGASUS_CIMSERVER_START_FILE      \  
     "/var/cache/pegasus/cimserver_start.conf"  
 # endif # endif
 #endif #endif
 #endif #endif
  
 #ifndef CIMSERVER_LOCK_FILE  #ifndef PEGASUS_CIMSERVER_START_FILE
 #define CIMSERVER_LOCK_FILE               "cimserver_start.lock"  #define PEGASUS_CIMSERVER_START_FILE      "/tmp/cimserver_start.conf"
   #endif
   #ifndef PEGASUS_CIMSERVER_START_LOCK_FILE
   #define PEGASUS_CIMSERVER_START_LOCK_FILE "/tmp/cimserver_start.lock"
 #endif #endif
 #ifndef PEGASUS_REPOSITORY_DIR #ifndef PEGASUS_REPOSITORY_DIR
 #define PEGASUS_REPOSITORY_DIR            "repository" #define PEGASUS_REPOSITORY_DIR            "repository"
Line 348 
Line 354 
 #ifndef PEGASUS_PLANNED_CONFIG_FILE_PATH #ifndef PEGASUS_PLANNED_CONFIG_FILE_PATH
 #define PEGASUS_PLANNED_CONFIG_FILE_PATH  "cimserver_planned.conf" #define PEGASUS_PLANNED_CONFIG_FILE_PATH  "cimserver_planned.conf"
 #endif #endif
 #ifndef PEGASUS_CIMSERVER_START_FILE  
 #define PEGASUS_CIMSERVER_START_FILE      "/tmp/cimserver_start.conf"  
 #endif  
 #ifndef PEGASUS_SSLCLIENT_CERTIFICATEFILE #ifndef PEGASUS_SSLCLIENT_CERTIFICATEFILE
 #define PEGASUS_SSLCLIENT_CERTIFICATEFILE "client.pem" #define PEGASUS_SSLCLIENT_CERTIFICATEFILE "client.pem"
 #endif #endif

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