(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.79.2.2 and 1.83

version 1.79.2.2, 2006/03/21 19:20:24 version 1.83, 2006/06/22 11:28:23
Line 1 
Line 1 
 //%2005////////////////////////////////////////////////////////////////////////  //%2006////////////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
Line 8 
Line 8 
 // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
 // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
 // EMC Corporation; VERITAS Software Corporation; The Open Group. // EMC Corporation; VERITAS Software Corporation; The Open Group.
   // Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   // EMC Corporation; Symantec Corporation; The Open Group.
 // //
 // Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
Line 179 
Line 181 
  
 // Interop Classes Accessed through Interop Control Provider // Interop Classes Accessed through Interop Control Provider
 #if !defined(PEGASUS_DISABLE_PERFINST) || defined(PEGASUS_ENABLE_SLP) #if !defined(PEGASUS_DISABLE_PERFINST) || defined(PEGASUS_ENABLE_SLP)
 // ++OLD  
 /*  
 static const CIMName PEGASUS_CLASSNAME_OBJECTMANAGER            = static const CIMName PEGASUS_CLASSNAME_OBJECTMANAGER            =
     CIMName ("CIM_ObjectManager");     CIMName ("CIM_ObjectManager");
 static const CIMName PEGASUS_CLASSNAME_PGNAMESPACE            = static const CIMName PEGASUS_CLASSNAME_PGNAMESPACE            =
Line 197 
Line 197 
     CIMName ("CIM_ProtocolAdapter");     CIMName ("CIM_ProtocolAdapter");
 static const CIMName PEGASUS_CLASSNAME_NAMESPACEINMANAGER  = static const CIMName PEGASUS_CLASSNAME_NAMESPACEINMANAGER  =
     CIMName ("CIM_NamespaceInManager");     CIMName ("CIM_NamespaceInManager");
     */  
 // --OLD  
   
 // ++NEW  
 static const CIMName PEGASUS_CLASSNAME_OBJECTMANAGERCOMMUNICATIONMECHANISM  =  
     CIMName ("CIM_ObjectManagerCommunicationMechanism");  
   
 static const CIMName PEGASUS_CLASSNAME_PG_OBJECTMANAGER            =  
     CIMName ("PG_ObjectManager");  
 static const CIMName PEGASUS_CLASSNAME_CIM_NAMESPACE            =  
     CIMName ("CIM_Namespace");  
 static const CIMName PEGASUS_CLASSNAME_PG_NAMESPACE            =  
     CIMName ("PG_Namespace");  
 static const CIMName PEGASUS_CLASSNAME_PG_COMMMECHANISMFORMANAGER  =  
     CIMName ("PG_CommMechanismForManager");  
 static const CIMName PEGASUS_CLASSNAME_PG_CIMXMLCOMMUNICATIONMECHANISM  =  
     CIMName ("PG_CIMXMLCommunicationMechanism");  
 // ++OK  
 static const CIMName PEGASUS_CLASSNAME_PG_NAMESPACEINMANAGER  =  
     CIMName ("PG_NamespaceInManager");  
 static const CIMName PEGASUS_CLASSNAME_PG_REGISTEREDPROFILE  =  
     CIMName ("PG_RegisteredProfile");  
 static const CIMName PEGASUS_CLASSNAME_PG_REGISTEREDSUBPROFILE  =  
     CIMName ("PG_RegisteredSubProfile");  
 static const CIMName PEGASUS_CLASSNAME_PG_REFERENCEDPROFILE  =  
     CIMName ("PG_ReferencedProfile");  
   
 static const CIMName PEGASUS_CLASSNAME_CIM_ELEMENTCONFORMSTOPROFILE  =  
     CIMName ("CIM_ElementConformsToProfile");  
 static const CIMName PEGASUS_CLASSNAME_PG_ELEMENTCONFORMSTOPROFILE  =  
     CIMName ("PG_ElementConformsToProfile");  
 static const CIMName PEGASUS_CLASSNAME_PG_SUBPROFILEREQUIRESPROFILE  =  
     CIMName ("PG_SubProfileRequiresProfile");  
 static const CIMName PEGASUS_CLASSNAME_PG_SOFTWAREIDENTITY  =  
     CIMName ("PG_SoftwareIdentity");  
 static const CIMName PEGASUS_CLASSNAME_PG_ELEMENTSOFTWAREIDENTITY  =  
     CIMName ("PG_ElementSoftwareIdentity");  
 static const CIMName PEGASUS_CLASSNAME_PG_INSTALLEDSOFTWAREIDENTITY  =  
     CIMName ("PG_InstalledSoftwareIdentity");  
   
 static const CIMName PEGASUS_CLASSNAME_PG_COMPUTERSYSTEM  =  
     CIMName ("PG_ComputerSystem");  
 static const CIMName PEGASUS_CLASSNAME_PG_HOSTEDOBJECTMANAGER  =  
     CIMName ("PG_HostedObjectManager");  
 static const CIMName PEGASUS_CLASSNAME_PG_HOSTEDACCESSPOINT  =  
     CIMName ("PG_HostedAccessPoint");  
   
 // Registration classes  
 static const CIMName PEGASUS_CLASSNAME_PG_PROVIDERPROFILECAPABILITIES  =  
     CIMName ("PG_ProviderProfileCapabilities");  
 static const CIMName PEGASUS_CLASSNAME_PG_PROVIDERREFERENCEDPROFILES  =  
     CIMName ("PG_ProviderReferencedProfiles");  
   
 // --NEW  
  
 // slp Class which operates slp provider. Started by system // slp Class which operates slp provider. Started by system
  
Line 303 
Line 249 
 // //
 // CIM Namespace Names // CIM Namespace Names
 // //
 static const CIMNamespaceName PEGASUS_NAMESPACENAME_ROOT  =  
     CIMNamespaceName ("root");  
 static const CIMNamespaceName PEGASUS_NAMESPACENAME_INTEROP  = static const CIMNamespaceName PEGASUS_NAMESPACENAME_INTEROP  =
     CIMNamespaceName ("root/PG_InterOp");     CIMNamespaceName ("root/PG_InterOp");
 static const CIMNamespaceName PEGASUS_NAMESPACENAME_INTERNAL = static const CIMNamespaceName PEGASUS_NAMESPACENAME_INTERNAL =
Line 398 
Line 343 
 // //
  
 #define CIMSERVER_LOCK_FILE               "cimserver_start.lock" #define CIMSERVER_LOCK_FILE               "cimserver_start.lock"
   #define PEGASUS_REPOSITORY_DIR            "repository"
   #define PEGASUS_CURRENT_CONFIG_FILE_PATH  "cimserver_current.conf"
   #define PEGASUS_PLANNED_CONFIG_FILE_PATH  "cimserver_planned.conf"
   #define PEGASUS_CIMSERVER_START_FILE      "/tmp/cimserver_start.conf"
 #define PEGASUS_SSLCLIENT_CERTIFICATEFILE "client.pem" #define PEGASUS_SSLCLIENT_CERTIFICATEFILE "client.pem"
 #define PEGASUS_SSLCLIENT_RANDOMFILE      "ssl.rnd" #define PEGASUS_SSLCLIENT_RANDOMFILE      "ssl.rnd"
 #define PEGASUS_SSLSERVER_RANDOMFILE      "cimserver.rnd" #define PEGASUS_SSLSERVER_RANDOMFILE      "cimserver.rnd"
Line 414 
Line 363 
 # if defined(PEGASUS_OS_HPUX) # if defined(PEGASUS_OS_HPUX)
 #  undef CIMSERVER_LOCK_FILE #  undef CIMSERVER_LOCK_FILE
 #  define CIMSERVER_LOCK_FILE               "/var/opt/wbem/cimserver_start.lock" #  define CIMSERVER_LOCK_FILE               "/var/opt/wbem/cimserver_start.lock"
   #  undef PEGASUS_REPOSITORY_DIR
   #  define PEGASUS_REPOSITORY_DIR            "/var/opt/wbem/repository"
   #  undef PEGASUS_CURRENT_CONFIG_FILE_PATH
   #  define PEGASUS_CURRENT_CONFIG_FILE_PATH  "/var/opt/wbem/cimserver_current.conf"
   #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH
   #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  "/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 433 
Line 390 
 # elif defined(PEGASUS_OS_AIX) # elif defined(PEGASUS_OS_AIX)
 #  undef CIMSERVER_LOCK_FILE #  undef CIMSERVER_LOCK_FILE
 #  define CIMSERVER_LOCK_FILE               "/opt/freeware/cimom/pegasus/etc/cimserver_start.lock" #  define CIMSERVER_LOCK_FILE               "/opt/freeware/cimom/pegasus/etc/cimserver_start.lock"
   #  undef PEGASUS_REPOSITORY_DIR
   #  define PEGASUS_REPOSITORY_DIR            "/opt/freeware/cimom/pegasus/etc/repository"
   #  undef PEGASUS_CURRENT_CONFIG_FILE_PATH
   #  define PEGASUS_CURRENT_CONFIG_FILE_PATH  "/opt/freeware/cimom/pegasus/etc/cimserver_current.conf"
   #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH
   #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  "/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 "/opt/freeware/cimom/pegasus/etc/client.pem" #  define PEGASUS_SSLCLIENT_CERTIFICATEFILE "/opt/freeware/cimom/pegasus/etc/client.pem"
 #  undef PEGASUS_SSLCLIENT_RANDOMFILE #  undef PEGASUS_SSLCLIENT_RANDOMFILE
Line 446 
Line 411 
 # elif defined(PEGASUS_OS_LINUX) && !defined(PEGASUS_OS_LSB) # elif defined(PEGASUS_OS_LINUX) && !defined(PEGASUS_OS_LSB)
 #  undef CIMSERVER_LOCK_FILE #  undef CIMSERVER_LOCK_FILE
 #  define CIMSERVER_LOCK_FILE               "/var/opt/tog-pegasus/cimserver_start.lock" #  define CIMSERVER_LOCK_FILE               "/var/opt/tog-pegasus/cimserver_start.lock"
   #  undef PEGASUS_REPOSITORY_DIR
   #  define PEGASUS_REPOSITORY_DIR            "/var/opt/tog-pegasus/repository"
   #  undef PEGASUS_CURRENT_CONFIG_FILE_PATH
   #  define PEGASUS_CURRENT_CONFIG_FILE_PATH  "/var/opt/tog-pegasus/cimserver_current.conf"
   #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH
   #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  "/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 463 
Line 436 
 #  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_LSB) # elif defined(PEGASUS_OS_LSB)
   #  undef PEGASUS_REPOSITORY_DIR
   #  define PEGASUS_REPOSITORY_DIR            "/var/opt/lsb-pegasus/repository"
   #  undef PEGASUS_CURRENT_CONFIG_FILE_PATH
   #  define PEGASUS_CURRENT_CONFIG_FILE_PATH  "/etc/opt/lsb-pegasus/cimserver_current.conf"
   #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH
   #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  "/etc/opt/lsb-pegasus/cimserver_planned.conf"
   #  undef PEGASUS_CIMSERVER_START_FILE
   #  define PEGASUS_CIMSERVER_START_FILE      "/var/run/cimserver.pid"
   #  undef PEGASUS_SSLCLIENT_CERTIFICATEFILE
 #  define PEGASUS_SSLCLIENT_CERTIFICATEFILE "/etc/opt/lsb-pegasus/client.pem" #  define PEGASUS_SSLCLIENT_CERTIFICATEFILE "/etc/opt/lsb-pegasus/client.pem"
 #  undef PEGASUS_SSLCLIENT_RANDOMFILE #  undef PEGASUS_SSLCLIENT_RANDOMFILE
 #  define PEGASUS_SSLCLIENT_RANDOMFILE      "/var/opt/lsb-pegasus/ssl.rnd" #  define PEGASUS_SSLCLIENT_RANDOMFILE      "/var/opt/lsb-pegasus/ssl.rnd"
Line 481 
Line 463 
 # elif defined(PEGASUS_OS_VMS) # elif defined(PEGASUS_OS_VMS)
 #  undef CIMSERVER_LOCK_FILE #  undef CIMSERVER_LOCK_FILE
 #  define CIMSERVER_LOCK_FILE               "/wbem_var/opt/wbem/cimserver_start.lock" #  define CIMSERVER_LOCK_FILE               "/wbem_var/opt/wbem/cimserver_start.lock"
   #  undef PEGASUS_REPOSITORY_DIR
   #  define PEGASUS_REPOSITORY_DIR            "/wbem_var/opt/wbem/repository"
   #  undef PEGASUS_CURRENT_CONFIG_FILE_PATH
   #  define PEGASUS_CURRENT_CONFIG_FILE_PATH  "/wbem_var/opt/wbem/cimserver_current.conf"
   #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH
   #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  "/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 "/wbem_var/opt/wbem/client.pem"  #  define PEGASUS_SSLCLIENT_CERTIFICATEFILE "/wbem_etc/opt/hp/sslshare/client.pem"
 #  undef PEGASUS_SSLCLIENT_RANDOMFILE #  undef PEGASUS_SSLCLIENT_RANDOMFILE
 #  define PEGASUS_SSLCLIENT_RANDOMFILE      "/wbem_var/opt/wbem/ssl.rnd" #  define PEGASUS_SSLCLIENT_RANDOMFILE      "/wbem_var/opt/wbem/ssl.rnd"
 #  undef PEGASUS_SSLSERVER_RANDOMFILE #  undef PEGASUS_SSLSERVER_RANDOMFILE
Line 492 
Line 482 
 #  undef PEGASUS_PAM_STANDALONE_PROC_NAME #  undef PEGASUS_PAM_STANDALONE_PROC_NAME
 #  undef PEGASUS_PROVIDER_AGENT_PROC_NAME #  undef PEGASUS_PROVIDER_AGENT_PROC_NAME
 #  define PEGASUS_PROVIDER_AGENT_PROC_NAME  "/wbem_var/opt/wbem/bin/cimprovagt" #  define PEGASUS_PROVIDER_AGENT_PROC_NAME  "/wbem_var/opt/wbem/bin/cimprovagt"
   # elif defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)
   #  undef PEGASUS_REPOSITORY_DIR
   #  define PEGASUS_REPOSITORY_DIR            "/var/wbem/repository"
   #  undef PEGASUS_CURRENT_CONFIG_FILE_PATH
   #  define PEGASUS_CURRENT_CONFIG_FILE_PATH  "/etc/wbem/cimserver_current.conf"
   #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH
   #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  "/etc/wbem/cimserver_planned.conf"
   #  undef PEGASUS_CIMSERVER_START_FILE
   #  define PEGASUS_CIMSERVER_START_FILE      "/tmp/cimserver.pid"
   # elif defined(PEGASUS_OS_DARWIN)
   #  undef PEGASUS_CURRENT_CONFIG_FILE_PATH
   #  define PEGASUS_CURRENT_CONFIG_FILE_PATH  "/etc/pegasus/cimserver_current.conf"
   #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH
   #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  "/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
Line 499 
Line 505 
 // Constant defines for path to icu resource bundles // Constant defines for path to icu resource bundles
 #ifdef PEGASUS_PLATFORM_OS400_ISERIES_IBM #ifdef PEGASUS_PLATFORM_OS400_ISERIES_IBM
 #define PEGASUS_DEFAULT_MESSAGE_SOURCE  "/QIBM/ProdData/OS400/CIM/msg" #define PEGASUS_DEFAULT_MESSAGE_SOURCE  "/QIBM/ProdData/OS400/CIM/msg"
 #elif defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)  #elif PEGASUS_PLATFORM_ZOS_ZSERIES_IBM
 #define PEGASUS_DEFAULT_MESSAGE_SOURCE  "/usr/lpp/wbem/msg" #define PEGASUS_DEFAULT_MESSAGE_SOURCE  "/usr/lpp/wbem/msg"
 #else #else
 #undef PEGASUS_DEFAULT_MESSAGE_SOURCE #undef PEGASUS_DEFAULT_MESSAGE_SOURCE
Line 519 
Line 525 
  
 // Constants defining the operational status of a CIM_ManagedSystemElement // Constants defining the operational status of a CIM_ManagedSystemElement
 #define CIM_MSE_OPSTATUS_VALUE_OK 2 #define CIM_MSE_OPSTATUS_VALUE_OK 2
   #define CIM_MSE_OPSTATUS_VALUE_DEGRADED 3
 #define CIM_MSE_OPSTATUS_VALUE_STOPPING 9 #define CIM_MSE_OPSTATUS_VALUE_STOPPING 9
 #define CIM_MSE_OPSTATUS_VALUE_STOPPED 10 #define CIM_MSE_OPSTATUS_VALUE_STOPPED 10
  
Line 527 
Line 534 
 #define PG_PROVMODULE_USERCTXT_DESIGNATED 3 #define PG_PROVMODULE_USERCTXT_DESIGNATED 3
 #define PG_PROVMODULE_USERCTXT_PRIVILEGED 4 #define PG_PROVMODULE_USERCTXT_PRIVILEGED 4
 #define PG_PROVMODULE_USERCTXT_CIMSERVER 5 #define PG_PROVMODULE_USERCTXT_CIMSERVER 5
   #define PEGASUS_DEFAULT_PROV_USERCTXT PG_PROVMODULE_USERCTXT_PRIVILEGED
  
 // Standard Pegasus Global Prefix. // Standard Pegasus Global Prefix.
 // This prefix is used as the basis for pegasus defined classes // This prefix is used as the basis for pegasus defined classes

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