omc-commit Mailing List for OMC - Open Management with CIM

Revision: 503
          http://omc.svn.sourceforge.net/omc/?rev=503&view=rev
Author:   bartw
Date:     2007-11-26 16:20:59 -0800 (Mon, 26 Nov 2007)

Log Message:
-----------
changes to support Pegasus

Modified Paths:
--------------
    pybase/trunk/OMC_InitdService.mof
    pybase/trunk/omc-pybase-providers.spec
    pybase/trunk/setup.py

Added Paths:
-----------
    pybase/trunk/MANIFEST.in
    pybase/trunk/OMC_InitdService-ow.reg
    pybase/trunk/OMC_InitdService-peg.reg
    pybase/trunk/OMC_LogicalFile-ow.reg
    pybase/trunk/OMC_LogicalFile-peg.reg
    pybase/trunk/OMC_OperatingSystem-ow.reg
    pybase/trunk/OMC_OperatingSystem-peg.reg
    pybase/trunk/OMC_UnitaryComputerSystem-ow.reg
    pybase/trunk/OMC_UnitaryComputerSystem-peg.reg
    pybase/trunk/OMC_UnixProcess-ow.reg
    pybase/trunk/OMC_UnixProcess-peg.reg

Removed Paths:
-------------
    pybase/trunk/MANIFEST
    pybase/trunk/OMC_InitdService.reg
    pybase/trunk/OMC_LogicalFile.reg
    pybase/trunk/OMC_OperatingSystem.reg
    pybase/trunk/OMC_UnitaryComputerSystem.reg
    pybase/trunk/OMC_UnixProcess.reg

Deleted: pybase/trunk/MANIFEST
===================================================================
--- pybase/trunk/MANIFEST	2007-10-06 17:09:06 UTC (rev 502)
+++ pybase/trunk/MANIFEST	2007-11-27 00:20:59 UTC (rev 503)
@@ -1,17 +0,0 @@
-OMC_Base.mof
-OMC_InitdService.py
-OMC_InitdService.mof
-OMC_InitdService.reg
-OMC_LogicalFile.py
-OMC_LogicalFile.mof
-OMC_LogicalFile.reg
-OMC_OperatingSystem.py
-OMC_OperatingSystem.mof
-OMC_OperatingSystem.reg
-OMC_UnitaryComputerSystem.py
-OMC_UnitaryComputerSystem.mof
-OMC_UnitaryComputerSystem.reg
-OMC_UnixProcess.py
-OMC_UnixProcess.mof
-OMC_UnixProcess.reg
-setup.py

Added: pybase/trunk/MANIFEST.in
===================================================================
--- pybase/trunk/MANIFEST.in	                        (rev 0)
+++ pybase/trunk/MANIFEST.in	2007-11-27 00:20:59 UTC (rev 503)
@@ -0,0 +1,2 @@
+include *.reg
+include *.mof

Added: pybase/trunk/OMC_InitdService-ow.reg
===================================================================
--- pybase/trunk/OMC_InitdService-ow.reg	                        (rev 0)
+++ pybase/trunk/OMC_InitdService-ow.reg	2007-11-27 00:20:59 UTC (rev 503)
@@ -0,0 +1,10 @@
+// Provider registration for OMC_InitdService
+instance of OpenWBEM_PyProviderRegistration
+{
+        InstanceID = "OMC:OMC_InitdService:01";
+        NamespaceNames = {"root/cimv2"}; 
+        ClassName = "OMC_InitdService"; 
+        ProviderTypes = {1,6};  // Instance, Method
+        ModulePath = "/usr/lib/pycim/OMC_InitdService.py";
+}; 
+

Added: pybase/trunk/OMC_InitdService-peg.reg
===================================================================
--- pybase/trunk/OMC_InitdService-peg.reg	                        (rev 0)
+++ pybase/trunk/OMC_InitdService-peg.reg	2007-11-27 00:20:59 UTC (rev 503)
@@ -0,0 +1,27 @@
+//////// OMC_InitdService 
+instance of PG_ProviderModule
+{
+    Name = "/usr/lib/pycim/OMC_InitdService.py"; 
+    InterfaceType = "Python"; 
+    InterfaceVersion = "1.0.0"; 
+    Location = "/usr/lib/pycim/OMC_InitdService.py"; 
+    Vendor = "OMC"; 
+    Version = "0.1.0"; 
+}; 
+
+instance of PG_Provider
+{
+    Name = "OMC_InitdService"; 
+    ProviderModuleName = "/usr/lib/pycim/OMC_InitdService.py"; 
+}; 
+
+instance of PG_ProviderCapabilities
+{
+    CapabilityID = "OMC_InitdService"; 
+    ProviderModuleName = "/usr/lib/pycim/OMC_InitdService.py"; 
+    ProviderName = "OMC_InitdService"; 
+    ClassName = "OMC_InitdService"; 
+    Namespaces = {"root/cimv2"}; 
+    ProviderType = {2,5}; // Instance, Method 
+}; 
+

Modified: pybase/trunk/OMC_InitdService.mof
===================================================================
--- pybase/trunk/OMC_InitdService.mof	2007-10-06 17:09:06 UTC (rev 502)
+++ pybase/trunk/OMC_InitdService.mof	2007-11-27 00:20:59 UTC (rev 503)
@@ -11,12 +11,10 @@
 "for more information.") ]
 class OMC_InitdService : CIM_Service
 {
-	[Key, Propagated ( "OMC_UnitaryComputerSystem.CreationClassName" ), 
-	 Description ("The CreationClassName of the scoping System.")]
+	[Key, Description ("The CreationClassName of the scoping System.")]
 	string SystemCreationClassName;
 
-	[Key, Propagated ( "OMC_UnitaryComputerSystem.Name" ), 
-	 Description ("The Name of the scoping System.")]
+	[Key, Description ("The Name of the scoping System.")]
 	string SystemName;
 
         [Key, Override ( "Name" ),
@@ -104,10 +102,10 @@
               "init scripts, in this case, a collection of OMC_InitdService objects")]
 class OMC_Runlevel : CIM_CollectionOfMSEs
 {
-	[ Key, Propagated("OMC_UnitaryComputerSystem.CreationClassName") ]
+	[ Key ]
 	string SystemCreationClassName;
 
-	[ Key, Propagated("OMC_UnitaryComputerSystem.Name") ]
+	[ Key ]
 	string SystemName;
 
 	[ Description("The runlevel of this instance.  This is typically a one-character identifier such as "

Deleted: pybase/trunk/OMC_InitdService.reg
===================================================================
--- pybase/trunk/OMC_InitdService.reg	2007-10-06 17:09:06 UTC (rev 502)
+++ pybase/trunk/OMC_InitdService.reg	2007-11-27 00:20:59 UTC (rev 503)
@@ -1,10 +0,0 @@
-// Provider registration for OMC_InitdService
-instance of OpenWBEM_PyProviderRegistration
-{
-        InstanceID = "OMC:OMC_InitdService:01";
-        NamespaceNames = {"root/cimv2"}; 
-        ClassName = "OMC_InitdService"; 
-        ProviderTypes = {1,6};  // Instance, Method
-        ModulePath = "/usr/lib/pycim/OMC_InitdService.py";
-}; 
-

Added: pybase/trunk/OMC_LogicalFile-ow.reg
===================================================================
--- pybase/trunk/OMC_LogicalFile-ow.reg	                        (rev 0)
+++ pybase/trunk/OMC_LogicalFile-ow.reg	2007-11-27 00:20:59 UTC (rev 503)
@@ -0,0 +1,82 @@
+
+// Provider registration for OMC_LinuxDirectoryContainsFile
+instance of OpenWBEM_PyProviderRegistration
+{
+        InstanceID = "OMC:OMC_LinuxDirectoryContainsFile:01"; 
+        NamespaceNames = {"root/cimv2"}; 
+        ClassName = "OMC_LinuxDirectoryContainsFile"; 
+        ProviderTypes = {1,3};  // Instance, Associator
+        ModulePath = "/usr/lib/pycim/OMC_LogicalFile.py";
+}; 
+
+// Provider registration for OMC_LinuxFileIdentity
+instance of OpenWBEM_PyProviderRegistration
+{
+        InstanceID = "OMC:OMC_LinuxFileIdentity:01"; 
+        NamespaceNames = {"root/cimv2"}; 
+        ClassName = "OMC_LinuxFileIdentity"; 
+        ProviderTypes = {1,3};  // Instance, Associator
+        ModulePath = "/usr/lib/pycim/OMC_LogicalFile.py";
+}; 
+
+// Provider registration for OMC_LinuxFile
+instance of OpenWBEM_PyProviderRegistration
+{
+        InstanceID = "OMC:OMC_LinuxFile:01"; 
+        NamespaceNames = {"root/cimv2"}; 
+        ClassName = "OMC_LinuxFile"; 
+        ProviderTypes = {1};  // Instance
+        ModulePath = "/usr/lib/pycim/OMC_LogicalFile.py";
+}; 
+
+// Provider registration for OMC_LinuxDataFile
+instance of OpenWBEM_PyProviderRegistration
+{
+        InstanceID = "OMC:OMC_LinuxDataFile:01"; 
+        NamespaceNames = {"root/cimv2"}; 
+        ClassName = "OMC_LinuxDataFile"; 
+        ProviderTypes = {1,6};  // Instance, Method
+        ModulePath = "/usr/lib/pycim/OMC_LogicalFile.py";
+}; 
+
+// Provider registration for OMC_LinuxDeviceFile
+instance of OpenWBEM_PyProviderRegistration
+{
+        InstanceID = "OMC:OMC_LinuxDeviceFile:01"; 
+        NamespaceNames = {"root/cimv2"}; 
+        ClassName = "OMC_LinuxDeviceFile"; 
+        ProviderTypes = {1};  // Instance
+        ModulePath = "/usr/lib/pycim/OMC_LogicalFile.py";
+}; 
+
+// Provider registration for OMC_LinuxDirectory
+instance of OpenWBEM_PyProviderRegistration
+{
+        InstanceID = "OMC:OMC_LinuxDirectory:01"; 
+        NamespaceNames = {"root/cimv2"}; 
+        ClassName = "OMC_LinuxDirectory"; 
+        ProviderTypes = {1};  // Instance
+        ModulePath = "/usr/lib/pycim/OMC_LogicalFile.py";
+}; 
+
+// Provider registration for OMC_LinuxFIFOPipeFile
+instance of OpenWBEM_PyProviderRegistration
+{
+        InstanceID = "OMC:OMC_LinuxFIFOPipeFile:01"; 
+        NamespaceNames = {"root/cimv2"}; 
+        ClassName = "OMC_LinuxFIFOPipeFile"; 
+        ProviderTypes = {1};  // Instance
+        ModulePath = "/usr/lib/pycim/OMC_LogicalFile.py";
+}; 
+
+// Provider registration for OMC_LinuxSymbolicLink
+instance of OpenWBEM_PyProviderRegistration
+{
+        InstanceID = "OMC:OMC_LinuxSymbolicLink:01"; 
+        NamespaceNames = {"root/cimv2"}; 
+        ClassName = "OMC_LinuxSymbolicLink"; 
+        ProviderTypes = {1};  // Instance
+        ModulePath = "/usr/lib/pycim/OMC_LogicalFile.py";
+}; 
+
+

Added: pybase/trunk/OMC_LogicalFile-peg.reg
===================================================================
--- pybase/trunk/OMC_LogicalFile-peg.reg	                        (rev 0)
+++ pybase/trunk/OMC_LogicalFile-peg.reg	2007-11-27 00:20:59 UTC (rev 503)
@@ -0,0 +1,98 @@
+//////// OMC_LogicalFile 
+instance of PG_ProviderModule
+{
+    Name = "/usr/lib/pycim/OMC_LogicalFile.py"; 
+    InterfaceType = "Python"; 
+    InterfaceVersion = "1.0.0"; 
+    Location = "/usr/lib/pycim/OMC_LogicalFile.py"; 
+    Vendor = "OMC"; 
+    Version = "0.1.0"; 
+}; 
+
+instance of PG_Provider
+{
+    Name = "OMC_LogicalFile"; 
+    ProviderModuleName = "/usr/lib/pycim/OMC_LogicalFile.py"; 
+}; 
+
+instance of PG_ProviderCapabilities
+{
+    CapabilityID = "OMC_LinuxDirectoryContainsFile"; 
+    ProviderModuleName = "/usr/lib/pycim/OMC_LogicalFile.py"; 
+    ProviderName = "OMC_LogicalFile"; 
+    ClassName = "OMC_LinuxDirectoryContainsFile"; 
+    Namespaces = {"root/cimv2"}; 
+    ProviderType = {2,3}; // Instance, Association 
+}; 
+
+instance of PG_ProviderCapabilities
+{
+    CapabilityID = "OMC_LinuxFileIdentity"; 
+    ProviderModuleName = "/usr/lib/pycim/OMC_LogicalFile.py"; 
+    ProviderName = "OMC_LogicalFile"; 
+    ClassName = "OMC_LinuxFileIdentity"; 
+    Namespaces = {"root/cimv2"}; 
+    ProviderType = {2,3}; // Instance, Association 
+}; 
+
+instance of PG_ProviderCapabilities
+{
+    CapabilityID = "OMC_LinuxFile"; 
+    ProviderModuleName = "/usr/lib/pycim/OMC_LogicalFile.py"; 
+    ProviderName = "OMC_LogicalFile"; 
+    ClassName = "OMC_LinuxFile"; 
+    Namespaces = {"root/cimv2"}; 
+    ProviderType = {2}; // Instance 
+}; 
+
+instance of PG_ProviderCapabilities
+{
+    CapabilityID = "OMC_LinuxDataFile"; 
+    ProviderModuleName = "/usr/lib/pycim/OMC_LogicalFile.py"; 
+    ProviderName = "OMC_LogicalFile"; 
+    ClassName = "OMC_LinuxDataFile"; 
+    Namespaces = {"root/cimv2"}; 
+    ProviderType = {2,5}; // Instance, Method 
+}; 
+
+instance of PG_ProviderCapabilities
+{
+    CapabilityID = "OMC_LinuxDeviceFile"; 
+    ProviderModuleName = "/usr/lib/pycim/OMC_LogicalFile.py"; 
+    ProviderName = "OMC_LogicalFile"; 
+    ClassName = "OMC_LinuxDeviceFile"; 
+    Namespaces = {"root/cimv2"}; 
+    ProviderType = {2}; // Instance 
+}; 
+
+instance of PG_ProviderCapabilities
+{
+    CapabilityID = "OMC_LinuxDirectory"; 
+    ProviderModuleName = "/usr/lib/pycim/OMC_LogicalFile.py"; 
+    ProviderName = "OMC_LogicalFile"; 
+    ClassName = "OMC_LinuxDirectory"; 
+    Namespaces = {"root/cimv2"}; 
+    ProviderType = {2}; // Instance 
+}; 
+
+instance of PG_ProviderCapabilities
+{
+    CapabilityID = "OMC_LinuxFIFOPipeFile"; 
+    ProviderModuleName = "/usr/lib/pycim/OMC_LogicalFile.py"; 
+    ProviderName = "OMC_LogicalFile"; 
+    ClassName = "OMC_LinuxFIFOPipeFile"; 
+    Namespaces = {"root/cimv2"}; 
+    ProviderType = {2}; // Instance 
+}; 
+
+instance of PG_ProviderCapabilities
+{
+    CapabilityID = "OMC_LinuxSymbolicLink"; 
+    ProviderModuleName = "/usr/lib/pycim/OMC_LogicalFile.py"; 
+    ProviderName = "OMC_LogicalFile"; 
+    ClassName = "OMC_LinuxSymbolicLink"; 
+    Namespaces = {"root/cimv2"}; 
+    ProviderType = {2}; // Instance 
+}; 
+
+

Deleted: pybase/trunk/OMC_LogicalFile.reg
===================================================================
--- pybase/trunk/OMC_LogicalFile.reg	2007-10-06 17:09:06 UTC (rev 502)
+++ pybase/trunk/OMC_LogicalFile.reg	2007-11-27 00:20:59 UTC (rev 503)
@@ -1,82 +0,0 @@
-
-// Provider registration for OMC_LinuxDirectoryContainsFile
-instance of OpenWBEM_PyProviderRegistration
-{
-        InstanceID = "OMC:OMC_LinuxDirectoryContainsFile:01"; 
-        NamespaceNames = {"root/cimv2"}; 
-        ClassName = "OMC_LinuxDirectoryContainsFile"; 
-        ProviderTypes = {1,3};  // Instance, Associator
-        ModulePath = "/usr/lib/pycim/OMC_LogicalFile.py";
-}; 
-
-// Provider registration for OMC_LinuxFileIdentity
-instance of OpenWBEM_PyProviderRegistration
-{
-        InstanceID = "OMC:OMC_LinuxFileIdentity:01"; 
-        NamespaceNames = {"root/cimv2"}; 
-        ClassName = "OMC_LinuxFileIdentity"; 
-        ProviderTypes = {1,3};  // Instance, Associator
-        ModulePath = "/usr/lib/pycim/OMC_LogicalFile.py";
-}; 
-
-// Provider registration for OMC_LinuxFile
-instance of OpenWBEM_PyProviderRegistration
-{
-        InstanceID = "OMC:OMC_LinuxFile:01"; 
-        NamespaceNames = {"root/cimv2"}; 
-        ClassName = "OMC_LinuxFile"; 
-        ProviderTypes = {1};  // Instance
-        ModulePath = "/usr/lib/pycim/OMC_LogicalFile.py";
-}; 
-
-// Provider registration for OMC_LinuxDataFile
-instance of OpenWBEM_PyProviderRegistration
-{
-        InstanceID = "OMC:OMC_LinuxDataFile:01"; 
-        NamespaceNames = {"root/cimv2"}; 
-        ClassName = "OMC_LinuxDataFile"; 
-        ProviderTypes = {1,6};  // Instance, Method
-        ModulePath = "/usr/lib/pycim/OMC_LogicalFile.py";
-}; 
-
-// Provider registration for OMC_LinuxDeviceFile
-instance of OpenWBEM_PyProviderRegistration
-{
-        InstanceID = "OMC:OMC_LinuxDeviceFile:01"; 
-        NamespaceNames = {"root/cimv2"}; 
-        ClassName = "OMC_LinuxDeviceFile"; 
-        ProviderTypes = {1};  // Instance
-        ModulePath = "/usr/lib/pycim/OMC_LogicalFile.py";
-}; 
-
-// Provider registration for OMC_LinuxDirectory
-instance of OpenWBEM_PyProviderRegistration
-{
-        InstanceID = "OMC:OMC_LinuxDirectory:01"; 
-        NamespaceNames = {"root/cimv2"}; 
-        ClassName = "OMC_LinuxDirectory"; 
-        ProviderTypes = {1};  // Instance
-        ModulePath = "/usr/lib/pycim/OMC_LogicalFile.py";
-}; 
-
-// Provider registration for OMC_LinuxFIFOPipeFile
-instance of OpenWBEM_PyProviderRegistration
-{
-        InstanceID = "OMC:OMC_LinuxFIFOPipeFile:01"; 
-        NamespaceNames = {"root/cimv2"}; 
-        ClassName = "OMC_LinuxFIFOPipeFile"; 
-        ProviderTypes = {1};  // Instance
-        ModulePath = "/usr/lib/pycim/OMC_LogicalFile.py";
-}; 
-
-// Provider registration for OMC_LinuxSymbolicLink
-instance of OpenWBEM_PyProviderRegistration
-{
-        InstanceID = "OMC:OMC_LinuxSymbolicLink:01"; 
-        NamespaceNames = {"root/cimv2"}; 
-        ClassName = "OMC_LinuxSymbolicLink"; 
-        ProviderTypes = {1};  // Instance
-        ModulePath = "/usr/lib/pycim/OMC_LogicalFile.py";
-}; 
-
-

Added: pybase/trunk/OMC_OperatingSystem-ow.reg
===================================================================
--- pybase/trunk/OMC_OperatingSystem-ow.reg	                        (rev 0)
+++ pybase/trunk/OMC_OperatingSystem-ow.reg	2007-11-27 00:20:59 UTC (rev 503)
@@ -0,0 +1,29 @@
+// Provider registration for OMC_OperatingSystem
+instance of OpenWBEM_PyProviderRegistration
+{
+        InstanceID = "OMC:OMC_OperatingSystem:01"; 
+        NamespaceNames = {"root/cimv2"}; 
+        ClassName = "OMC_OperatingSystem"; 
+        ProviderTypes = {1,6};  // Instance, Method
+        ModulePath = "/usr/lib/pycim/OMC_OperatingSystem.py"; 
+}; 
+
+// Provider registration for OMC_InstalledOS
+instance of OpenWBEM_PyProviderRegistration
+{
+        InstanceID = "OMC:OMC_InstalledOS:01"; 
+        NamespaceNames = {"root/cimv2"}; 
+        ClassName = "OMC_InstalledOS"; 
+        ProviderTypes = {1,3};  // Instance, Associator
+        ModulePath = "/usr/lib/pycim/OMC_OperatingSystem.py"; 
+}; 
+
+// Provider registration for OMC_InstalledOS
+instance of OpenWBEM_PyProviderRegistration
+{
+        InstanceID = "OMC:OMC_RunningOS:01"; 
+        NamespaceNames = {"root/cimv2"}; 
+        ClassName = "OMC_RunningOS"; 
+        ProviderTypes = {1,3};  // Instance, Associator
+        ModulePath = "/usr/lib/pycim/OMC_OperatingSystem.py"; 
+}; 

Added: pybase/trunk/OMC_OperatingSystem-peg.reg
===================================================================
--- pybase/trunk/OMC_OperatingSystem-peg.reg	                        (rev 0)
+++ pybase/trunk/OMC_OperatingSystem-peg.reg	2007-11-27 00:20:59 UTC (rev 503)
@@ -0,0 +1,47 @@
+//////// OMC_OperatingSystem 
+instance of PG_ProviderModule
+{
+    Name = "/usr/lib/pycim/OMC_OperatingSystem.py"; 
+    InterfaceType = "Python"; 
+    InterfaceVersion = "1.0.0"; 
+    Location = "/usr/lib/pycim/OMC_OperatingSystem.py"; 
+    Vendor = "OMC"; 
+    Version = "0.1.0"; 
+}; 
+
+instance of PG_Provider
+{
+    Name = "OMC_OperatingSystem"; 
+    ProviderModuleName = "/usr/lib/pycim/OMC_OperatingSystem.py"; 
+}; 
+
+instance of PG_ProviderCapabilities
+{
+    CapabilityID = "OMC_OperatingSystem"; 
+    ProviderModuleName = "/usr/lib/pycim/OMC_OperatingSystem.py"; 
+    ProviderName = "OMC_OperatingSystem"; 
+    ClassName = "OMC_OperatingSystem"; 
+    Namespaces = {"root/cimv2"}; 
+    ProviderType = {2,5}; // Instance, Method 
+}; 
+
+instance of PG_ProviderCapabilities
+{
+    CapabilityID = "OMC_InstalledOS"; 
+    ProviderModuleName = "/usr/lib/pycim/OMC_OperatingSystem.py"; 
+    ProviderName = "OMC_OperatingSystem"; 
+    ClassName = "OMC_InstalledOS"; 
+    Namespaces = {"root/cimv2"}; 
+    ProviderType = {2,3}; // Instance, Association 
+}; 
+
+instance of PG_ProviderCapabilities
+{
+    CapabilityID = "OMC_RunningOS"; 
+    ProviderModuleName = "/usr/lib/pycim/OMC_OperatingSystem.py"; 
+    ProviderName = "OMC_OperatingSystem"; 
+    ClassName = "OMC_RunningOS"; 
+    Namespaces = {"root/cimv2"}; 
+    ProviderType = {2,3}; // Instance, Association 
+}; 
+

Deleted: pybase/trunk/OMC_OperatingSystem.reg
===================================================================
--- pybase/trunk/OMC_OperatingSystem.reg	2007-10-06 17:09:06 UTC (rev 502)
+++ pybase/trunk/OMC_OperatingSystem.reg	2007-11-27 00:20:59 UTC (rev 503)
@@ -1,29 +0,0 @@
-// Provider registration for OMC_OperatingSystem
-instance of OpenWBEM_PyProviderRegistration
-{
-        InstanceID = "OMC:OMC_OperatingSystem:01"; 
-        NamespaceNames = {"root/cimv2"}; 
-        ClassName = "OMC_OperatingSystem"; 
-        ProviderTypes = {1,6};  // Instance, Method
-        ModulePath = "/usr/lib/pycim/OMC_OperatingSystem.py"; 
-}; 
-
-// Provider registration for OMC_InstalledOS
-instance of OpenWBEM_PyProviderRegistration
-{
-        InstanceID = "OMC:OMC_InstalledOS:01"; 
-        NamespaceNames = {"root/cimv2"}; 
-        ClassName = "OMC_InstalledOS"; 
-        ProviderTypes = {1,3};  // Instance, Associator
-        ModulePath = "/usr/lib/pycim/OMC_OperatingSystem.py"; 
-}; 
-
-// Provider registration for OMC_InstalledOS
-instance of OpenWBEM_PyProviderRegistration
-{
-        InstanceID = "OMC:OMC_RunningOS:01"; 
-        NamespaceNames = {"root/cimv2"}; 
-        ClassName = "OMC_RunningOS"; 
-        ProviderTypes = {1,3};  // Instance, Associator
-        ModulePath = "/usr/lib/pycim/OMC_OperatingSystem.py"; 
-}; 

Added: pybase/trunk/OMC_UnitaryComputerSystem-ow.reg
===================================================================
--- pybase/trunk/OMC_UnitaryComputerSystem-ow.reg	                        (rev 0)
+++ pybase/trunk/OMC_UnitaryComputerSystem-ow.reg	2007-11-27 00:20:59 UTC (rev 503)
@@ -0,0 +1,9 @@
+// Provider registration for OMC_UnitaryComputerSystem
+instance of OpenWBEM_PyProviderRegistration
+{
+        InstanceID = "OMC:OMC_UnitaryComputerSystem:01"; 
+        NamespaceNames = {"root/cimv2"}; 
+        ClassName = "OMC_UnitaryComputerSystem"; 
+        ProviderTypes = {1,6};  // Instance, Method
+        ModulePath = "/usr/lib/pycim/OMC_UnitaryComputerSystem.py"; 
+}; 

Added: pybase/trunk/OMC_UnitaryComputerSystem-peg.reg
===================================================================
--- pybase/trunk/OMC_UnitaryComputerSystem-peg.reg	                        (rev 0)
+++ pybase/trunk/OMC_UnitaryComputerSystem-peg.reg	2007-11-27 00:20:59 UTC (rev 503)
@@ -0,0 +1,28 @@
+//////// OMC_UnitaryComputerSystem 
+instance of PG_ProviderModule
+{
+    Name = "/usr/lib/pycim/OMC_UnitaryComputerSystem.py"; 
+    InterfaceType = "Python"; 
+    InterfaceVersion = "1.0.0"; 
+    Location = "/usr/lib/pycim/OMC_UnitaryComputerSystem.py"; 
+    Vendor = "OMC"; 
+    Version = "0.1.0"; 
+}; 
+
+instance of PG_Provider
+{
+    Name = "OMC_UnitaryComputerSystem"; 
+    ProviderModuleName = "/usr/lib/pycim/OMC_UnitaryComputerSystem.py"; 
+}; 
+
+instance of PG_ProviderCapabilities
+{
+    CapabilityID = "OMC_UnitaryComputerSystem"; 
+    ProviderModuleName = "/usr/lib/pycim/OMC_UnitaryComputerSystem.py"; 
+    ProviderName = "OMC_UnitaryComputerSystem"; 
+    ClassName = "OMC_UnitaryComputerSystem"; 
+    Namespaces = {"root/cimv2"}; 
+    ProviderType = {2,5}; // Instance, Method 
+}; 
+
+

Deleted: pybase/trunk/OMC_UnitaryComputerSystem.reg
===================================================================
--- pybase/trunk/OMC_UnitaryComputerSystem.reg	2007-10-06 17:09:06 UTC (rev 502)
+++ pybase/trunk/OMC_UnitaryComputerSystem.reg	2007-11-27 00:20:59 UTC (rev 503)
@@ -1,9 +0,0 @@
-// Provider registration for OMC_UnitaryComputerSystem
-instance of OpenWBEM_PyProviderRegistration
-{
-        InstanceID = "OMC:OMC_UnitaryComputerSystem:01"; 
-        NamespaceNames = {"root/cimv2"}; 
-        ClassName = "OMC_UnitaryComputerSystem"; 
-        ProviderTypes = {1,6};  // Instance, Method
-        ModulePath = "/usr/lib/pycim/OMC_UnitaryComputerSystem.py"; 
-}; 

Added: pybase/trunk/OMC_UnixProcess-ow.reg
===================================================================
--- pybase/trunk/OMC_UnixProcess-ow.reg	                        (rev 0)
+++ pybase/trunk/OMC_UnixProcess-ow.reg	2007-11-27 00:20:59 UTC (rev 503)
@@ -0,0 +1,30 @@
+// Provider registration for OMC_UnixProcess
+instance of OpenWBEM_PyProviderRegistration
+{
+        InstanceID = "OMC:OMC_UnixProcess:01"; 
+        NamespaceNames = {"root/cimv2"}; 
+        ClassName = "OMC_UnixProcess"; 
+        ProviderTypes = {1,6};  // Instance, Method
+        ModulePath = "/usr/lib/pycim/OMC_UnixProcess.py"; 
+}; 
+
+// Provider registration for OMC_ProcessExecutable
+instance of OpenWBEM_PyProviderRegistration
+{
+        InstanceID = "OMC:OMC_ProcessExecutable:01"; 
+        NamespaceNames = {"root/cimv2"}; 
+        ClassName = "OMC_ProcessExecutable"; 
+        ProviderTypes = {1,3};  // Instance, Associator
+        ModulePath = "/usr/lib/pycim/OMC_UnixProcess.py"; 
+}; 
+
+// Provider registration for OMC_OSProcess
+instance of OpenWBEM_PyProviderRegistration
+{
+        InstanceID = "OMC:OMC_OSProcess:01"; 
+        NamespaceNames = {"root/cimv2"}; 
+        ClassName = "OMC_OSProcess"; 
+        ProviderTypes = {1,3};  // Instance, Associator
+        ModulePath = "/usr/lib/pycim/OMC_UnixProcess.py"; 
+}; 
+

Added: pybase/trunk/OMC_UnixProcess-peg.reg
===================================================================
--- pybase/trunk/OMC_UnixProcess-peg.reg	                        (rev 0)
+++ pybase/trunk/OMC_UnixProcess-peg.reg	2007-11-27 00:20:59 UTC (rev 503)
@@ -0,0 +1,48 @@
+//////// OMC_UnixProcess 
+instance of PG_ProviderModule
+{
+    Name = "/usr/lib/pycim/OMC_UnixProcess.py"; 
+    InterfaceType = "Python"; 
+    InterfaceVersion = "1.0.0"; 
+    Location = "/usr/lib/pycim/OMC_UnixProcess.py"; 
+    Vendor = "OMC"; 
+    Version = "0.1.0"; 
+}; 
+
+instance of PG_Provider
+{
+    Name = "OMC_UnixProcess"; 
+    ProviderModuleName = "/usr/lib/pycim/OMC_UnixProcess.py"; 
+}; 
+
+instance of PG_ProviderCapabilities
+{
+    CapabilityID = "OMC_UnixProcess"; 
+    ProviderModuleName = "/usr/lib/pycim/OMC_UnixProcess.py"; 
+    ProviderName = "OMC_UnixProcess"; 
+    ClassName = "OMC_UnixProcess"; 
+    Namespaces = {"root/cimv2"}; 
+    ProviderType = {2,5}; // Instance, Method 
+}; 
+
+instance of PG_ProviderCapabilities
+{
+    CapabilityID = "OMC_ProcessExecutable"; 
+    ProviderModuleName = "/usr/lib/pycim/OMC_UnixProcess.py"; 
+    ProviderName = "OMC_UnixProcess"; 
+    ClassName = "OMC_ProcessExecutable"; 
+    Namespaces = {"root/cimv2"}; 
+    ProviderType = {2,3}; // Instance, Association 
+}; 
+
+instance of PG_ProviderCapabilities
+{
+    CapabilityID = "OMC_OSProcess"; 
+    ProviderModuleName = "/usr/lib/pycim/OMC_UnixProcess.py"; 
+    ProviderName = "OMC_UnixProcess"; 
+    ClassName = "OMC_OSProcess"; 
+    Namespaces = {"root/cimv2"}; 
+    ProviderType = {2,3}; // Instance, Association 
+}; 
+
+

Deleted: pybase/trunk/OMC_UnixProcess.reg
===================================================================
--- pybase/trunk/OMC_UnixProcess.reg	2007-10-06 17:09:06 UTC (rev 502)
+++ pybase/trunk/OMC_UnixProcess.reg	2007-11-27 00:20:59 UTC (rev 503)
@@ -1,30 +0,0 @@
-// Provider registration for OMC_UnixProcess
-instance of OpenWBEM_PyProviderRegistration
-{
-        InstanceID = "OMC:OMC_UnixProcess:01"; 
-        NamespaceNames = {"root/cimv2"}; 
-        ClassName = "OMC_UnixProcess"; 
-        ProviderTypes = {1,6};  // Instance, Method
-        ModulePath = "/usr/lib/pycim/OMC_UnixProcess.py"; 
-}; 
-
-// Provider registration for OMC_ProcessExecutable
-instance of OpenWBEM_PyProviderRegistration
-{
-        InstanceID = "OMC:OMC_ProcessExecutable:01"; 
-        NamespaceNames = {"root/cimv2"}; 
-        ClassName = "OMC_ProcessExecutable"; 
-        ProviderTypes = {1,3};  // Instance, Associator
-        ModulePath = "/usr/lib/pycim/OMC_UnixProcess.py"; 
-}; 
-
-// Provider registration for OMC_OSProcess
-instance of OpenWBEM_PyProviderRegistration
-{
-        InstanceID = "OMC:OMC_OSProcess:01"; 
-        NamespaceNames = {"root/cimv2"}; 
-        ClassName = "OMC_OSProcess"; 
-        ProviderTypes = {1,3};  // Instance, Associator
-        ModulePath = "/usr/lib/pycim/OMC_UnixProcess.py"; 
-}; 
-

Modified: pybase/trunk/omc-pybase-providers.spec
===================================================================
--- pybase/trunk/omc-pybase-providers.spec	2007-10-06 17:09:06 UTC (rev 502)
+++ pybase/trunk/omc-pybase-providers.spec	2007-11-27 00:20:59 UTC (rev 503)
@@ -21,7 +21,7 @@
 BuildArch:      noarch
 Source0:	%{name}-%{version}.tar.gz
 PreReq:		/usr/bin/loadmof.sh
-Requires:       python-pywbem openwbem openwbem-python-providerifc
+Requires:       python-pywbem pyprovifc>=1.0.0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -61,7 +61,12 @@
 
 %post
 loadmof.sh -n root/cimv2 /usr/share/mof/%{name}/OMC_Base.mof
-loadmof.sh -n Interop /usr/share/mof/%{name}/*.reg
+if [ -x /usr/bin/peg-loadmof.sh ]; then
+  /usr/bin/peg-loadmof.sh -n root/PG_InterOp /usr/share/mof/%{name}/*-peg.reg
+fi
+if [ -x /usr/bin/ow-loadmof.sh ]; then
+  /usr/bin/ow-loadmof.sh -n Interop /usr/share/mof/%{name}/*-ow.reg
+fi
 
 %changelog -n omc-pybase-providers
 * Tue May 15 2007 - bwh...@su...

Modified: pybase/trunk/setup.py
===================================================================
--- pybase/trunk/setup.py	2007-10-06 17:09:06 UTC (rev 502)
+++ pybase/trunk/setup.py	2007-11-27 00:20:59 UTC (rev 503)
@@ -4,8 +4,15 @@
 # For example: 
 #   python setup.py install --install-lib=/usr/lib/pycim -O1
 
+import os
 from distutils.core import setup
 
+manifest = os.path.dirname(os.path.abspath(__file__)) + '/MANIFEST'
+if os.path.exists(manifest):
+    print 'removing existing MANIFEST file'
+    os.unlink(manifest)
+
+
 setup(name='omc-pybase-providers',
       author='Jon Carey, Bart Whiteley',
       author_email='jc...@no..., bwh...@su...',


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