[Omc-commit] SF.net SVN: omc: [431] smash/branches/1.0/src/providers

[<np...@us...>]

Revision: 431
          http://svn.sourceforge.net/omc/?rev=431&view=rev
Author:   npaxton
Date:     2007-02-01 09:50:42 -0800 (Thu, 01 Feb 2007)

Log Message:
-----------
Change CIM_SoftwareIdentityCollection to CIM_SystemSpecificCollection:  SoftwareIdentityCollection was removed from the cimv2.14 exp. schema.  All refs to it revert back to CIM_SystemSpecificCollection

Modified Paths:
--------------
    smash/branches/1.0/src/providers/base-server-profile/Notes.txt
    smash/branches/1.0/src/providers/firmware-inventory-profile/HostedFirmwareCollection.cpp
    smash/branches/1.0/src/providers/firmware-inventory-profile/RegisteredFirmwareInvProfile.cpp

Modified: smash/branches/1.0/src/providers/base-server-profile/Notes.txt
===================================================================
--- smash/branches/1.0/src/providers/base-server-profile/Notes.txt	2007-02-01 17:45:21 UTC (rev 430)
+++ smash/branches/1.0/src/providers/base-server-profile/Notes.txt	2007-02-01 17:50:42 UTC (rev 431)
@@ -13,7 +13,10 @@
 CIM_LogicalDevice (From various other profiles)
 Novell_SystemTimeService (CIM_TimeService)
 CIM_ConcreteCollection (System Collection Profile)
-CIM_SoftwareIdentityCollection (SystemCollectionProfile)
+// NOTE: This was previously CIM_SoftwareIdentityCollection, but that class
+// was removed from the cim experimental schema in cim v 2.14.  All refs to
+// that class revert back to parent class: CIM_SystemSpecificCollection
+CIM_SystemSpecificCollection (SystemCollectionProfile)
 
 Profile Associations:
 Novell_HostedTimeService (CIM_HostedService)

Modified: smash/branches/1.0/src/providers/firmware-inventory-profile/HostedFirmwareCollection.cpp
===================================================================
--- smash/branches/1.0/src/providers/firmware-inventory-profile/HostedFirmwareCollection.cpp	2007-02-01 17:45:21 UTC (rev 430)
+++ smash/branches/1.0/src/providers/firmware-inventory-profile/HostedFirmwareCollection.cpp	2007-02-01 17:50:42 UTC (rev 431)
@@ -179,11 +179,14 @@
 				}
 				else
 				{
-					// If this is the CIM_SoftwareIdentityCollection or one
+					// If this is the CIM_SystemSpecificCollection or one
 					// of it's base classes, then do all 
 					// OMC_XXXFirmwareIdentityCollection classes
+					// NOTE: This was previously CIM_SoftwareIdentityCollection, but that class
+					// was removed from the cim experimental schema in cim v 2.14.  All refs to
+					// that class revert back to parent class: CIM_SystemSpecificCollection
 					if (!OMC::CIMUtils::classIsDerivedFrom(
-						"CIM_SoftwareIdentityCollection", resultClass,
+						"CIM_SystemSpecificCollection", resultClass,
 						env->getCIMOMHandle(), ns))
 					{
 						return;

Modified: smash/branches/1.0/src/providers/firmware-inventory-profile/RegisteredFirmwareInvProfile.cpp
===================================================================
--- smash/branches/1.0/src/providers/firmware-inventory-profile/RegisteredFirmwareInvProfile.cpp	2007-02-01 17:45:21 UTC (rev 430)
+++ smash/branches/1.0/src/providers/firmware-inventory-profile/RegisteredFirmwareInvProfile.cpp	2007-02-01 17:50:42 UTC (rev 431)
@@ -211,11 +211,14 @@
 				}
 				else
 				{
-					// If this is the CIM_SoftwareIdentityCollection or one
+					// If this is the CIM_SystemSpecificCollection or one
 					// of it's base classes, then do all 
 					// OMC_XXXFirmwareIdentityCollection classes
+					// NOTE: This was previously CIM_SoftwareIdentityCollection, but that class
+					// was removed from the cim experimental schema in cim v 2.14.  All refs to
+					// that class revert back to parent class: CIM_SystemSpecificCollection
 					if (!OMC::CIMUtils::classIsDerivedFrom(
-						"CIM_SoftwareIdentityCollection", resultClass,
+						"CIM_SystemSpecificCollection", resultClass,
 						env->getCIMOMHandle(), ns))
 					{
 						return;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.