(file) Return to ProviderRegistrationProvider.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / ControlProviders / ProviderRegistrationProvider

Diff for /pegasus/src/Pegasus/ControlProviders/ProviderRegistrationProvider/ProviderRegistrationProvider.cpp between version 1.82.2.3 and 1.83

version 1.82.2.3, 2006/03/17 21:40:50 version 1.83, 2006/01/10 19:41:17
Line 1 
Line 1 
 //%2006////////////////////////////////////////////////////////////////////////  //%2005////////////////////////////////////////////////////////////////////////
 // //
 // 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 455 
Line 453 
 #ifdef PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER #ifdef PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER
             && ifcTypeString != "CMPI"             && ifcTypeString != "CMPI"
 #endif #endif
 #ifdef PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER  
             && (ifcTypeString != "JMPI")  
             && (ifcTypeString != "JMPIExperimental")  
 #endif  
                 )                 )
         {         {
                 //l10n 485                 //l10n 485
Line 488 
Line 482 
            (ifcTypeString == "CMPI" &&            (ifcTypeString == "CMPI" &&
             ifcVersionString != "2.0.0") ||             ifcVersionString != "2.0.0") ||
 #endif #endif
 #ifdef PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER  
            (ifcTypeString == "JMPI" &&  
             ifcVersionString != "1.0.0" &&  
             ifcVersionString != "2.0.0" &&  
             ifcVersionString != "2.2.0") ||  
            (ifcTypeString == "JMPIExperimental" &&  
             ifcVersionString != "0.0.1") ||  
 #endif  
            (ifcTypeString == "C++Default" &&            (ifcTypeString == "C++Default" &&
             ifcVersionString != "2.1.0" &&             ifcVersionString != "2.1.0" &&
             ifcVersionString != "2.2.0" &&             ifcVersionString != "2.2.0" &&
             ifcVersionString != "2.3.0" &&             ifcVersionString != "2.3.0" &&
             ifcVersionString != "2.5.0" &&              ifcVersionString != "2.5.0"))
             ifcVersionString != "2.6.0"))  
         {         {
                 //l10n 485                 //l10n 485
             //throw PEGASUS_CIM_EXCEPTION(CIM_ERR_NOT_SUPPORTED,             //throw PEGASUS_CIM_EXCEPTION(CIM_ERR_NOT_SUPPORTED,

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