Menu
▾
▴
[Omc-commit] SF.net SVN: omc:[846] cmpiprofiles
|
From: <mik...@us...> - 2008-08-13 18:30:31
|
Revision: 846
http://omc.svn.sourceforge.net/omc/?rev=846&view=rev
Author: mike-brasher
Date: 2008-08-13 18:30:31 +0000 (Wed, 13 Aug 2008)
Log Message:
-----------
Namespace re-organization.
Modified Paths:
--------------
cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile-interop.mof
cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.reg
cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.registration
cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfile.h
cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfileProvider.c
cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ReferencedProfileProvider.c
cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RegisteredProfileProvider.c
cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/Resource.h
cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/mof/linux-ssh-service-profile-interop.mof
cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/mof/linux-ssh-service-profile.reg
cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/mof/linux-ssh-service-profile.registration
cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ElementConformsToProfile.h
cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ElementConformsToProfileProvider.c
cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ReferencedProfileProvider.c
cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/RegisteredProfileProvider.c
cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/Resource.h
Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile-interop.mof
===================================================================
--- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile-interop.mof 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile-interop.mof 2008-08-13 18:30:31 UTC (rev 846)
@@ -7,7 +7,7 @@
class Linux_PowerElementConformsToProfile : CIM_ElementConformsToProfile
{
[Key] Linux_PowerRegisteredProfile REF ConformantStandard;
- [Key] Linux_PowerSupply REF ManagedElement;
+ // [Key] Linux_PowerSupply REF ManagedElement;
};
[Association]
Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.reg
===================================================================
--- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.reg 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.reg 2008-08-13 18:30:31 UTC (rev 846)
@@ -44,13 +44,13 @@
provider: Linux_PowerReferencedProfile
location: linux_powersupplyprovider
type: instance association
- namespace: root/cimv2 root/cimv2
+ namespace: root/interop
#
[Linux_PowerRegisteredProfile]
provider: Linux_PowerRegisteredProfile
location: linux_powersupplyprovider
type: instance method
- namespace: root/cimv2 root/interop
+ namespace: root/interop
#
[Linux_PowerSystemDevice]
provider: Linux_PowerSystemDevice
Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.registration
===================================================================
--- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.registration 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.registration 2008-08-13 18:30:31 UTC (rev 846)
@@ -5,6 +5,6 @@
Linux_PowerOwningCollectionElement root/cimv2 Linux_PowerOwningCollectionElement linux_powersupplyprovider instance association
Linux_PowerSupply root/cimv2 Linux_PowerSupply linux_powersupplyprovider instance method
Linux_PowerRedundancySet root/cimv2 Linux_PowerRedundancySet linux_powersupplyprovider instance method
-Linux_PowerReferencedProfile root/cimv2\ root/cimv2 Linux_PowerReferencedProfile linux_powersupplyprovider instance association
-Linux_PowerRegisteredProfile root/cimv2\ root/interop Linux_PowerRegisteredProfile linux_powersupplyprovider instance method
+Linux_PowerReferencedProfile root/interop Linux_PowerReferencedProfile linux_powersupplyprovider instance association
+Linux_PowerRegisteredProfile root/interop Linux_PowerRegisteredProfile linux_powersupplyprovider instance method
Linux_PowerSystemDevice root/cimv2 Linux_PowerSystemDevice linux_powersupplyprovider instance association
Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfile.h
===================================================================
--- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfile.h 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfile.h 2008-08-13 18:30:31 UTC (rev 846)
@@ -11,7 +11,7 @@
#include <konkret/konkret.h>
#include "RegisteredProfile.h"
-#include "PowerSupply.h"
+#include "CIM_ManagedElement.h"
/*
**==============================================================================
@@ -27,7 +27,7 @@
KBase __base;
/* CIM_ElementConformsToProfile features */
const KRef ConformantStandard; /* RegisteredProfile */
- const KRef ManagedElement; /* PowerSupply */
+ const KRef ManagedElement; /* CIM_ManagedElement */
/* Linux_PowerElementConformsToProfile features */
}
ElementConformsToProfileRef;
@@ -50,7 +50,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 = __PowerSupply_sig;
+ ((KRef*)&self->ManagedElement)->__sig = __CIM_ManagedElement_sig;
}
KINLINE CMPIStatus ElementConformsToProfileRef_InitFromInstance(
@@ -156,7 +156,7 @@
KINLINE CMPIStatus ElementConformsToProfileRef_Set_ManagedElement(
ElementConformsToProfileRef* self,
- const PowerSupplyRef* x)
+ const CIM_ManagedElementRef* x)
{
if (self && self->__base.magic == KMAGIC)
{
@@ -200,7 +200,7 @@
KBase __base;
/* CIM_ElementConformsToProfile features */
const KRef ConformantStandard; /* RegisteredProfile */
- const KRef ManagedElement; /* PowerSupply */
+ const KRef ManagedElement; /* CIM_ManagedElement */
/* Linux_PowerElementConformsToProfile features */
}
ElementConformsToProfile;
@@ -223,7 +223,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 = __PowerSupply_sig;
+ ((KRef*)&self->ManagedElement)->__sig = __CIM_ManagedElement_sig;
}
KINLINE CMPIStatus ElementConformsToProfile_InitFromInstance(
@@ -329,7 +329,7 @@
KINLINE CMPIStatus ElementConformsToProfile_Set_ManagedElement(
ElementConformsToProfile* self,
- const PowerSupplyRef* x)
+ const CIM_ManagedElementRef* x)
{
if (self && self->__base.magic == KMAGIC)
{
Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfileProvider.c 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfileProvider.c 2008-08-13 18:30:31 UTC (rev 846)
@@ -33,7 +33,7 @@
const CMPIObjectPath* cop,
const char** properties)
{
- const char* ns = KNameSpace(cop);
+ const char* ns = INTEROP_NAMESPACE;
RegisteredProfileRef cs;
/* Linux_FanRegisteredProfile.ConformantStandard */
Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ReferencedProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ReferencedProfileProvider.c 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ReferencedProfileProvider.c 2008-08-13 18:30:31 UTC (rev 846)
@@ -195,7 +195,7 @@
ReferencedProfileInitialize())
KONKRET_REGISTRATION(
- "root/cimv2 root/cimv2",
+ "root/interop",
"Linux_PowerReferencedProfile",
"Linux_PowerReferencedProfile",
"instance association");
Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RegisteredProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RegisteredProfileProvider.c 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RegisteredProfileProvider.c 2008-08-13 18:30:31 UTC (rev 846)
@@ -132,7 +132,7 @@
RegisteredProfileInitialize())
KONKRET_REGISTRATION(
- "root/cimv2 root/interop",
+ "root/interop",
"Linux_PowerRegisteredProfile",
"Linux_PowerRegisteredProfile",
"instance method");
Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/Resource.h
===================================================================
--- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/Resource.h 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/Resource.h 2008-08-13 18:30:31 UTC (rev 846)
@@ -14,6 +14,7 @@
#endif
#define NAMESPACE "root/cimv2"
+#define INTEROP_NAMESPACE "root/interop"
typedef struct _Str256
{
Modified: cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/mof/linux-ssh-service-profile-interop.mof
===================================================================
--- cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/mof/linux-ssh-service-profile-interop.mof 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/mof/linux-ssh-service-profile-interop.mof 2008-08-13 18:30:31 UTC (rev 846)
@@ -6,7 +6,7 @@
class Linux_SSHElementConformsToProfile : CIM_ElementConformsToProfile
{
[Key] Linux_SSHRegisteredProfile REF ConformantStandard;
- [Key] Linux_SSHProtocolService REF ManagedElement;
+ // [Key] Linux_SSHProtocolService REF ManagedElement;
};
[Association]
Modified: cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/mof/linux-ssh-service-profile.reg
===================================================================
--- cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/mof/linux-ssh-service-profile.reg 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/mof/linux-ssh-service-profile.reg 2008-08-13 18:30:31 UTC (rev 846)
@@ -50,11 +50,11 @@
provider: Linux_SSHReferencedProfile
location: linux_sshserviceprovider
type: instance association
- namespace: root/cimv2 root/interop
+ namespace: root/interop
#
[Linux_SSHRegisteredProfile]
provider: Linux_SSHRegisteredProfile
location: linux_sshserviceprovider
type: instance method
- namespace: root/cimv2 root/interop
+ namespace: root/interop
#
Modified: cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/mof/linux-ssh-service-profile.registration
===================================================================
--- cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/mof/linux-ssh-service-profile.registration 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/mof/linux-ssh-service-profile.registration 2008-08-13 18:30:31 UTC (rev 846)
@@ -6,5 +6,5 @@
Linux_SSHProtocolEndpoint root/cimv2 Linux_SSHProtocolEndpoint linux_sshserviceprovider instance method
Linux_SSHProtocolService root/cimv2 Linux_SSHProtocolService linux_sshserviceprovider instance method
Linux_SSHProvidesEndpoint root/cimv2 Linux_SSHProvidesEndpoint linux_sshserviceprovider instance association
-Linux_SSHReferencedProfile root/cimv2\ root/interop Linux_SSHReferencedProfile linux_sshserviceprovider instance association
-Linux_SSHRegisteredProfile root/cimv2\ root/interop Linux_SSHRegisteredProfile linux_sshserviceprovider instance method
+Linux_SSHReferencedProfile root/interop Linux_SSHReferencedProfile linux_sshserviceprovider instance association
+Linux_SSHRegisteredProfile root/interop Linux_SSHRegisteredProfile linux_sshserviceprovider instance method
Modified: cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ElementConformsToProfile.h
===================================================================
--- cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ElementConformsToProfile.h 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ElementConformsToProfile.h 2008-08-13 18:30:31 UTC (rev 846)
@@ -11,7 +11,7 @@
#include <konkret/konkret.h>
#include "RegisteredProfile.h"
-#include "ProtocolService.h"
+#include "CIM_ManagedElement.h"
/*
**==============================================================================
@@ -27,7 +27,7 @@
KBase __base;
/* CIM_ElementConformsToProfile features */
const KRef ConformantStandard; /* RegisteredProfile */
- const KRef ManagedElement; /* ProtocolService */
+ const KRef ManagedElement; /* CIM_ManagedElement */
/* Linux_SSHElementConformsToProfile 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 = __ProtocolService_sig;
+ ((KRef*)&self->ManagedElement)->__sig = __CIM_ManagedElement_sig;
}
KINLINE CMPIStatus ElementConformsToProfileRef_InitFromInstance(
@@ -155,7 +155,7 @@
KINLINE CMPIStatus ElementConformsToProfileRef_Set_ManagedElement(
ElementConformsToProfileRef* self,
- const ProtocolServiceRef* 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; /* ProtocolService */
+ const KRef ManagedElement; /* CIM_ManagedElement */
/* Linux_SSHElementConformsToProfile 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 = __ProtocolService_sig;
+ ((KRef*)&self->ManagedElement)->__sig = __CIM_ManagedElement_sig;
}
KINLINE CMPIStatus ElementConformsToProfile_InitFromInstance(
@@ -327,7 +327,7 @@
KINLINE CMPIStatus ElementConformsToProfile_Set_ManagedElement(
ElementConformsToProfile* self,
- const ProtocolServiceRef* x)
+ const CIM_ManagedElementRef* x)
{
if (self && self->__base.magic == KMAGIC)
{
Modified: cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ElementConformsToProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ElementConformsToProfileProvider.c 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ElementConformsToProfileProvider.c 2008-08-13 18:30:31 UTC (rev 846)
@@ -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-ssh_service_profile/trunk/src/ReferencedProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ReferencedProfileProvider.c 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ReferencedProfileProvider.c 2008-08-13 18:30:31 UTC (rev 846)
@@ -195,7 +195,7 @@
ReferencedProfileInitialize())
KONKRET_REGISTRATION(
- "root/cimv2 root/interop",
+ "root/interop",
"Linux_SSHReferencedProfile",
"Linux_SSHReferencedProfile",
"instance association");
Modified: cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/RegisteredProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/RegisteredProfileProvider.c 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/RegisteredProfileProvider.c 2008-08-13 18:30:31 UTC (rev 846)
@@ -132,7 +132,7 @@
RegisteredProfileInitialize())
KONKRET_REGISTRATION(
- "root/cimv2 root/interop",
+ "root/interop",
"Linux_SSHRegisteredProfile",
"Linux_SSHRegisteredProfile",
"instance method");
Modified: cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/Resource.h
===================================================================
--- cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/Resource.h 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/Resource.h 2008-08-13 18:30:31 UTC (rev 846)
@@ -12,6 +12,7 @@
#define HIDDEN __attribute__((visibility("hidden")))
#define NAMESPACE "root/cimv2"
+#define INTEROP_NAMESPACE "root/interop"
/* Returns 0 if sshd service is running */
HIDDEN int GetSSHDStatus();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
