[Omc-commit] SF.net SVN: omc:[843] cmpiprofiles/sblim-cmpi-boot_control_profile/trunk

[<mik...@us...>]

Revision: 843
          http://omc.svn.sourceforge.net/omc/?rev=843&view=rev
Author:   mike-brasher
Date:     2008-08-13 18:17:36 +0000 (Wed, 13 Aug 2008)

Log Message:
-----------
Reassigned instances to propert namespaces.

Modified Paths:
--------------
    cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/mof/linux-boot-control-profile-interop.mof
    cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ElementConformsToProfile.h
    cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ElementConformsToProfileProvider.c
    cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ReferencedProfileProvider.c
    cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/RegisteredProfileProvider.c
    cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/Resource.h

Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/mof/linux-boot-control-profile-interop.mof
===================================================================
--- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/mof/linux-boot-control-profile-interop.mof	2008-08-13 18:15:13 UTC (rev 842)
+++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/mof/linux-boot-control-profile-interop.mof	2008-08-13 18:17:36 UTC (rev 843)
@@ -6,7 +6,7 @@
 class Linux_BootElementConformsToProfile : CIM_ElementConformsToProfile
 {   
     [Key] Linux_BootRegisteredProfile REF ConformantStandard;
-    [Key] Linux_BootService REF ManagedElement;
+    // [Key] Linux_BootService REF ManagedElement;
 };
     
 [Association]

Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ElementConformsToProfile.h
===================================================================
--- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ElementConformsToProfile.h	2008-08-13 18:15:13 UTC (rev 842)
+++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ElementConformsToProfile.h	2008-08-13 18:17:36 UTC (rev 843)
@@ -11,7 +11,7 @@
 
 #include <konkret/konkret.h>
 #include "RegisteredProfile.h"
-#include "BootService.h"
+#include "CIM_ManagedElement.h"
 
 /*
 **==============================================================================
@@ -27,7 +27,7 @@
     KBase __base;
     /* CIM_ElementConformsToProfile features */
     const KRef ConformantStandard; /* RegisteredProfile */
-    const KRef ManagedElement; /* BootService */
+    const KRef ManagedElement; /* CIM_ManagedElement */
     /* Linux_BootElementConformsToProfile features */
 }
 ElementConformsToProfileRef;
@@ -49,7 +49,7 @@
     const unsigned char* sig = __ElementConformsToProfileRef_sig;
     KBase_Init(&self->__base, cb, sizeof(*self), sig, ns);
     ((KRef*)&self->ConformantStandard)->__sig = __RegisteredProfile_sig;
-    ((KRef*)&self->ManagedElement)->__sig = __BootService_sig;
+    ((KRef*)&self->ManagedElement)->__sig = __CIM_ManagedElement_sig;
 }
 
 KINLINE CMPIStatus ElementConformsToProfileRef_InitFromInstance(
@@ -155,7 +155,7 @@
 
 KINLINE CMPIStatus ElementConformsToProfileRef_Set_ManagedElement(
     ElementConformsToProfileRef* self,
-    const BootServiceRef* x)
+    const CIM_ManagedElementRef* x)
 {
     if (self && self->__base.magic == KMAGIC)
     {
@@ -199,7 +199,7 @@
     KBase __base;
     /* CIM_ElementConformsToProfile features */
     const KRef ConformantStandard; /* RegisteredProfile */
-    const KRef ManagedElement; /* BootService */
+    const KRef ManagedElement; /* CIM_ManagedElement */
     /* Linux_BootElementConformsToProfile features */
 }
 ElementConformsToProfile;
@@ -221,7 +221,7 @@
     const unsigned char* sig = __ElementConformsToProfile_sig;
     KBase_Init(&self->__base, cb, sizeof(*self), sig, ns);
     ((KRef*)&self->ConformantStandard)->__sig = __RegisteredProfile_sig;
-    ((KRef*)&self->ManagedElement)->__sig = __BootService_sig;
+    ((KRef*)&self->ManagedElement)->__sig = __CIM_ManagedElement_sig;
 }
 
 KINLINE CMPIStatus ElementConformsToProfile_InitFromInstance(
@@ -327,7 +327,7 @@
 
 KINLINE CMPIStatus ElementConformsToProfile_Set_ManagedElement(
     ElementConformsToProfile* self,
-    const BootServiceRef* x)
+    const CIM_ManagedElementRef* x)
 {
     if (self && self->__base.magic == KMAGIC)
     {

Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ElementConformsToProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ElementConformsToProfileProvider.c	2008-08-13 18:15:13 UTC (rev 842)
+++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ElementConformsToProfileProvider.c	2008-08-13 18:17:36 UTC (rev 843)
@@ -33,7 +33,7 @@
     const CMPIObjectPath* cop, 
     const char** properties) 
 {
-    const char* ns = KNameSpace(cop);
+    const char* ns = INTEROP_NAMESPACE;
     RegisteredProfileRef cs;
 
     /* Linux_SSHRegisteredProfile.ConformantStandard */

Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ReferencedProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ReferencedProfileProvider.c	2008-08-13 18:15:13 UTC (rev 842)
+++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ReferencedProfileProvider.c	2008-08-13 18:17:36 UTC (rev 843)
@@ -195,7 +195,7 @@
     ReferencedProfileInitialize())
 
 KONKRET_REGISTRATION(
-    "root/cimv2 root/interop",
+    "root/cimv2",
     "Linux_BootReferencedProfile",
     "Linux_BootReferencedProfile",
     "instance association");

Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/RegisteredProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/RegisteredProfileProvider.c	2008-08-13 18:15:13 UTC (rev 842)
+++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/RegisteredProfileProvider.c	2008-08-13 18:17:36 UTC (rev 843)
@@ -132,7 +132,7 @@
     RegisteredProfileInitialize())
 
 KONKRET_REGISTRATION(
-    "root/cimv2 root/interop",
+    "root/cimv2",
     "Linux_BootRegisteredProfile",
     "Linux_BootRegisteredProfile",
     "instance method");

Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/Resource.h
===================================================================
--- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/Resource.h	2008-08-13 18:15:13 UTC (rev 842)
+++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/Resource.h	2008-08-13 18:17:36 UTC (rev 843)
@@ -11,6 +11,7 @@
 #endif
 
 #define NAMESPACE "root/cimv2"
+#define INTEROP_NAMESPACE "root/interop"
 
 typedef struct _Str256
 {


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