(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.129.4.1

version 1.116, 2007/09/05 19:45:45 version 1.129.4.1, 2008/07/01 15:17:57
Line 55 
Line 55 
  
 #define PEGASUS_QUEUENAME_HTTPACCEPTOR        "HTTPAcceptor" #define PEGASUS_QUEUENAME_HTTPACCEPTOR        "HTTPAcceptor"
 #define PEGASUS_QUEUENAME_HTTPCONNECTION      "HTTPConnection" #define PEGASUS_QUEUENAME_HTTPCONNECTION      "HTTPConnection"
 #define PEGASUS_QUEUENAME_HTTPCONNECTOR       "HTTPConnector"  
 #define PEGASUS_QUEUENAME_HTTPOPTIONS         "HTTPOptions"  
  
 #define PEGASUS_QUEUENAME_HTTPAUTHDELEGATOR   "HTTPAuthenticatorDelegator" #define PEGASUS_QUEUENAME_HTTPAUTHDELEGATOR   "HTTPAuthenticatorDelegator"
 #define PEGASUS_QUEUENAME_OPREQDECODER        "CIMOpRequestDecoder" #define PEGASUS_QUEUENAME_OPREQDECODER        "CIMOpRequestDecoder"
Line 114 
Line 112 
      PEGASUS_QUEUENAME_CONTROLSERVICE "::CIMOMStatDataProvider"      PEGASUS_QUEUENAME_CONTROLSERVICE "::CIMOMStatDataProvider"
 #endif #endif
  
 #ifndef PEGASUS_DISABLE_CQL  #ifdef PEGASUS_ENABLE_CQL
 # define PEGASUS_MODULENAME_CIMQUERYCAPPROVIDER \ # define PEGASUS_MODULENAME_CIMQUERYCAPPROVIDER \
      PEGASUS_QUEUENAME_CONTROLSERVICE "::CIMQueryCapabilitiesProvider"      PEGASUS_QUEUENAME_CONTROLSERVICE "::CIMQueryCapabilitiesProvider"
 #endif #endif
Line 173 
Line 171 
  */  */
  
 #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"
   #define PEGASUS_SSL_ACCEPT_TIMEOUT_SECONDS 20
   #define PEGASUS_PROVIDER_IDLE_TIMEOUT_SECONDS 300
   
  
  
 /* /*
Line 209 
Line 211 
 #  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 236 
     "/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 260 
     "/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 280 
 #  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 298 
 #  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 312 
 #  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 330 
 #  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
 # define PEGASUS_CIMSERVER_START_FILE      "/tmp/cimserver_start.conf"  # define PEGASUS_CIMSERVER_START_FILE      "/var/tmp/cimserver_start.conf"
 # define PEGASUS_CIMSERVER_START_LOCK_FILE "/tmp/cimserver_start.lock"  # define PEGASUS_CIMSERVER_START_LOCK_FILE "/var/tmp/cimserver_start.lock"
 # define PEGASUS_REPOSITORY_DIR            "repository" # define PEGASUS_REPOSITORY_DIR            "repository"
 # define PEGASUS_CURRENT_CONFIG_FILE_PATH  "cimserver_current.conf" # define PEGASUS_CURRENT_CONFIG_FILE_PATH  "cimserver_current.conf"
 # define PEGASUS_PLANNED_CONFIG_FILE_PATH  "cimserver_planned.conf" # define PEGASUS_PLANNED_CONFIG_FILE_PATH  "cimserver_planned.conf"
Line 333 
Line 343 
 # define PEGASUS_SSLCLIENT_RANDOMFILE      "ssl.rnd" # define PEGASUS_SSLCLIENT_RANDOMFILE      "ssl.rnd"
 # define PEGASUS_SSLSERVER_RANDOMFILE      "cimserver.rnd" # define PEGASUS_SSLSERVER_RANDOMFILE      "cimserver.rnd"
 # define PEGASUS_LOCAL_AUTH_DIR            "/tmp" # define PEGASUS_LOCAL_AUTH_DIR            "/tmp"
 # define PEGASUS_LOCAL_DOMAIN_SOCKET_PATH  "/tmp/cimxml.socket"  # define PEGASUS_LOCAL_DOMAIN_SOCKET_PATH  "/var/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
  */  */
Line 396 
Line 397 
 */ */
 #define PEGASUS_INSTANCEID_GLOBAL_PREFIX "PG" #define PEGASUS_INSTANCEID_GLOBAL_PREFIX "PG"
  
   /* Constants defining the size of the hash table used in the OrderedSet
      implementation. Specific classes have their own hash table size to
      accomodate for amounts of probable members
   */
   #define PEGASUS_PROPERTY_ORDEREDSET_HASHSIZE 32
   #define PEGASUS_QUALIFIER_ORDEREDSET_HASHSIZE 16
   #define PEGASUS_PARAMETER_ORDEREDSET_HASHSIZE 16
   #define PEGASUS_METHOD_ORDEREDSET_HASHSIZE 16
   
   /* defines a number value for an OrderedSet when either
      the index to a specific member is unknown, meaning not initialized
      (PEGASUS_ORDEREDSET_INDEX_UNKNOWN)
      of the specific member is not part of the list
      (PEGASUS_ORDEREDSET_INDEX_NOTFOUND)
   */
   #define PEGASUS_ORDEREDSET_INDEX_NOTFOUND 0xFFFFFFFF
   #define PEGASUS_ORDEREDSET_INDEX_UNKNOWN 0xFFFFFFFE
   
   /*
      Defines the maximum authenticated username length.
   */
   #ifdef PEGASUS_OS_PASE
   #define PEGASUS_MAX_USER_NAME_LEN 10
   #else
   #define PEGASUS_MAX_USER_NAME_LEN 256
   #endif
   
 /* /*
 **============================================================================== **==============================================================================
 ** **
Line 453 
Line 481 
     extern const CIMName PEGASUS_CLASSNAME_FORMATTEDINDSUBSCRIPTION;     extern const CIMName PEGASUS_CLASSNAME_FORMATTEDINDSUBSCRIPTION;
 PEGASUS_COMMON_LINKAGE extern const CIMName PEGASUS_CLASSNAME_INDHANDLER; PEGASUS_COMMON_LINKAGE extern const CIMName PEGASUS_CLASSNAME_INDHANDLER;
 PEGASUS_COMMON_LINKAGE extern const CIMName PEGASUS_CLASSNAME_LSTNRDST; PEGASUS_COMMON_LINKAGE extern const CIMName PEGASUS_CLASSNAME_LSTNRDST;
 PEGASUS_COMMON_LINKAGE extern const CIMName PEGASUS_CLASSNAME_INDHANDLER_CIMXML;  PEGASUS_COMMON_LINKAGE
       extern const CIMName PEGASUS_CLASSNAME_INDHANDLER_CIMXML;
 PEGASUS_COMMON_LINKAGE extern const CIMName PEGASUS_CLASSNAME_LSTNRDST_CIMXML; PEGASUS_COMMON_LINKAGE extern const CIMName PEGASUS_CLASSNAME_LSTNRDST_CIMXML;
 PEGASUS_COMMON_LINKAGE extern const CIMName PEGASUS_CLASSNAME_INDHANDLER_SNMP; PEGASUS_COMMON_LINKAGE extern const CIMName PEGASUS_CLASSNAME_INDHANDLER_SNMP;
 PEGASUS_COMMON_LINKAGE PEGASUS_COMMON_LINKAGE
Line 467 
Line 496 
 PEGASUS_COMMON_LINKAGE extern const CIMName PEGASUS_CLASSNAME_CIMOMSTATDATA; PEGASUS_COMMON_LINKAGE extern const CIMName PEGASUS_CLASSNAME_CIMOMSTATDATA;
 #endif #endif
  
 #ifndef PEGASUS_DISABLE_CQL  #ifdef PEGASUS_ENABLE_CQL
 PEGASUS_COMMON_LINKAGE PEGASUS_COMMON_LINKAGE
     extern const CIMName PEGASUS_CLASSNAME_CIMQUERYCAPABILITIES;     extern const CIMName PEGASUS_CLASSNAME_CIMQUERYCAPABILITIES;
 #endif #endif
  
   PEGASUS_COMMON_LINKAGE extern const CIMName PEGASUS_CLASSNAME_PROVIDERINDDATA;
   PEGASUS_COMMON_LINKAGE
       extern const CIMName PEGASUS_CLASSNAME_SUBSCRIPTIONINDDATA;
  
 // Definitions for Interop Classes Accessed through Interop Control Provider // Definitions for Interop Classes Accessed through Interop Control Provider
  
Line 514 
Line 546 
 PEGASUS_COMMON_LINKAGE PEGASUS_COMMON_LINKAGE
     extern const CIMName PEGASUS_CLASSNAME_PG_ELEMENTCONFORMSTOPROFILE;     extern const CIMName PEGASUS_CLASSNAME_PG_ELEMENTCONFORMSTOPROFILE;
 PEGASUS_COMMON_LINKAGE PEGASUS_COMMON_LINKAGE
       extern const CIMName PEGASUS_CLASSNAME_PG_ELEMENTCONFORMSTOPROFILE_RP_RP;
   PEGASUS_COMMON_LINKAGE
     extern const CIMName PEGASUS_CLASSNAME_PG_SUBPROFILEREQUIRESPROFILE;     extern const CIMName PEGASUS_CLASSNAME_PG_SUBPROFILEREQUIRESPROFILE;
 PEGASUS_COMMON_LINKAGE PEGASUS_COMMON_LINKAGE
     extern const CIMName PEGASUS_CLASSNAME_PG_SOFTWAREIDENTITY;     extern const CIMName PEGASUS_CLASSNAME_PG_SOFTWAREIDENTITY;
Line 546 
Line 580 
 PEGASUS_COMMON_LINKAGE extern const CIMName PEGASUS_CLASSNAME_WBEMSLPTEMPLATE; PEGASUS_COMMON_LINKAGE extern const CIMName PEGASUS_CLASSNAME_WBEMSLPTEMPLATE;
 #endif #endif
  
   // DMTF Indications profile classes
   #ifdef PEGASUS_ENABLE_DMTF_INDICATION_PROFILE_SUPPORT
   PEGASUS_COMMON_LINKAGE
       extern const CIMName PEGASUS_CLASSNAME_CIM_INDICATIONSERVICE;
   PEGASUS_COMMON_LINKAGE
       extern const CIMName PEGASUS_CLASSNAME_CIM_INDICATIONSERVICECAPABILITIES;
   PEGASUS_COMMON_LINKAGE
       extern const CIMName PEGASUS_CLASSNAME_PG_ELEMENTCAPABILITIES;
   PEGASUS_COMMON_LINKAGE
       extern const CIMName PEGASUS_CLASSNAME_PG_HOSTEDINDICATIONSERVICE;
   PEGASUS_COMMON_LINKAGE
       extern const CIMName PEGASUS_CLASSNAME_PG_SERVICEAFFECTSELEMENT;
   #endif
   
 // //
 // Property Names Indication Subscriptions // Property Names Indication Subscriptions
 // //
Line 677 
Line 725 
     extern const CIMNamespaceName PEGASUS_NAMESPACENAME_CIMOMSTATDATA;     extern const CIMNamespaceName PEGASUS_NAMESPACENAME_CIMOMSTATDATA;
 #endif #endif
  
 #ifndef PEGASUS_DISABLE_CQL  #ifdef PEGASUS_ENABLE_CQL
 PEGASUS_COMMON_LINKAGE PEGASUS_COMMON_LINKAGE
     extern const CIMNamespaceName PEGASUS_NAMESPACENAME_CIMQUERYCAPABILITIES;     extern const CIMNamespaceName PEGASUS_NAMESPACENAME_CIMQUERYCAPABILITIES;
 #endif #endif

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