Menu
▾
▴
[Sblim-commit] Git: SFCB - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-87-ga308ad3
|
From: Chris B. <buc...@us...> - 2011-05-30 21:17:52
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SFCB - Small Footprint CIM Broker".
The branch, master has been updated
via a308ad3ec7861cf10d27cd1f5214d17ba023e8c7 (commit)
via 58efd63da97f82721789acf826abb2e48647c37b (commit)
via e7bf71b3ff4c8f6e347b3c922db47554830bfaf4 (commit)
from f466bb31d62ddb41072e5fc3b9de4df497f85b27 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a308ad3ec7861cf10d27cd1f5214d17ba023e8c7
Merge: 58efd63da97f82721789acf826abb2e48647c37b f466bb31d62ddb41072e5fc3b9de4df497f85b27
Author: buccella <buc...@li...>
Date: Mon May 30 16:05:43 2011 -0400
Merge branch 'master' of ssh://sblim.git.sourceforge.net/gitroot/sblim/sfcb
Conflicts:
ChangeLog
commit 58efd63da97f82721789acf826abb2e48647c37b
Author: buccella <buc...@li...>
Date: Mon May 30 16:00:43 2011 -0400
[ 3309374 ] Implement CIM_CIMXMLCommunicationMechanism
commit e7bf71b3ff4c8f6e347b3c922db47554830bfaf4
Author: buccella <buc...@li...>
Date: Mon May 30 14:52:42 2011 -0400
[ 3309374 ] Implement CIM_CIMXMLCommunicationMechanism
-----------------------------------------------------------------------
Summary of changes:
diff --git a/10_interop.mof b/10_interop.mof
index 6bdcd83..a726caa 100644
--- a/10_interop.mof
+++ b/10_interop.mof
@@ -15,7 +15,7 @@ class DMY_IndicationService : CIM_IndicationService
{
};
-class DMY_ObjectManagerCommunicationMechanism : CIM_ObjectManagerCommunicationMechanism
+class SFCB_CIMXMLCommunicationMechanism : CIM_CIMXMLCommunicationMechanism
{
};
@@ -70,6 +70,11 @@ class DMY_HostedService : CIM_HostedService
{
};
+class DMY_NamespaceInManager : CIM_NamespaceInManager
+{
+};
+
+
class SFCB_ElementConformsToProfile : CIM_ElementConformsToProfile
{
};
diff --git a/ChangeLog b/ChangeLog
index e8f8812..f75ffcc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-30 Chris Buccella <buc...@li...>
+
+ * 10_interop.mof, default.reg.in, interopServerProvider.c,
+ test/xmltest/enumerateinstancenames.ComMech.lines:
+ [ 3309374 ] Implement CIM_CIMXMLCommunicationMechanism
+
2011-05-27 Narasimha Sharoff <nsh...@us...>
* Makefile.am
diff --git a/NEWS b/NEWS
index e342661..510938b 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ New features:
- 3190623 Set *IsSettable propperties to false for IndicationService
- 3280992 Add systemd file to SFCB sources
- 3177587 create sfcCommon (SFCB 1.4 now requires sfcCommon lib to be installed)
+- 3309374 Implement CIM_CIMXMLCommunicationMechanism
Bugs fixed:
- 3199899 sfcb uninstall process should remove test mof's
diff --git a/default.reg.in b/default.reg.in
index db71500..e2aab7e 100644
--- a/default.reg.in
+++ b/default.reg.in
@@ -95,7 +95,7 @@
type: instance
namespace: root/interop
#
-[CIM_ObjectManagerCommunicationMechanism]
+[SFCB_CIMXMLCommunicationMechanism]
provider: ServerProvider
location: sfcInteropServerProvider
type: instance
@@ -132,4 +132,9 @@
unload: never
namespace: root/interop
#
-
+[CIM_NamespaceInManager]
+ provider: ServerProvider
+ location: sfcInteropServerProvider
+ type: association
+ namespace: root/interop
+#
diff --git a/interopServerProvider.c b/interopServerProvider.c
index 67ccafd..19e1507 100644
--- a/interopServerProvider.c
+++ b/interopServerProvider.c
@@ -1,8 +1,8 @@
/*
- * classProvider.c
+ * interopServerProvider.c
*
- * (C) Copyright IBM Corp. 2005
+ * (C) Copyright IBM Corp. 2005, 2010, 2011
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -15,7 +15,18 @@
*
* Description:
*
- * InteropServer provider for sfcb .
+ * InteropServer provider for sfcb
+ *
+ * Has implementation for the following classes:
+ *
+ * Namespace
+ * ObjectManager
+ * CIMXMLCommunicationMechanism
+ * IndicationService
+ * IndicationServiceCapabilities
+ * ServiceAffectsElement
+ * HostedService
+ * ElementConformsToProfile
*
*/
@@ -553,11 +564,11 @@ ComMechProviderEnumInstanceNames(CMPIInstanceMI * mi,
_SFCB_ENTER(TRACE_PROVIDERS, "ComMechProviderEnumInstanceNames");
op = CMNewObjectPath(_broker, "root/interop",
- "CIM_ObjectManagerCommunicationMechanism", NULL);
+ "SFCB_CIMXMLCommunicationMechanism", NULL);
CMAddKey(op, "SystemCreationClassName", "CIM_ObjectManager", CMPI_chars);
CMAddKey(op, "CreationClassName",
- "CIM_ObjectManagerCommunicationMechanism", CMPI_chars);
+ "SFCB_CIMXMLCommunicationMechanism", CMPI_chars);
hostName[0] = 0;
gethostname(hostName, 511);
CMAddKey(op, "SystemName", hostName, CMPI_chars);
@@ -591,13 +602,13 @@ ComMechProviderEnumInstances(CMPIInstanceMI * mi,
_SFCB_ENTER(TRACE_PROVIDERS, "ComMechProviderEnumInstanceNames");
op = CMNewObjectPath(_broker, "root/interop",
- "CIM_ObjectManagerCommunicationMechanism", NULL);
+ "SFCB_CIMXMLCommunicationMechanism", NULL);
ci = CMNewInstance(_broker, op, NULL);
CMSetProperty(ci, "SystemCreationClassName", "CIM_ObjectManager",
CMPI_chars);
CMSetProperty(ci, "CreationClassName",
- "CIM_ObjectManagerCommunicationMechanism", CMPI_chars);
+ "SFCB_CIMXMLCommunicationMechanism", CMPI_chars);
hostName[0] = 0;
gethostname(hostName, 511);
CMSetProperty(ci, "SystemName", hostName, CMPI_chars);
@@ -626,6 +637,8 @@ ComMechProviderEnumInstances(CMPIInstanceMI * mi,
CMSetProperty(ci, "MultipleOperationsSupported", &bul, CMPI_boolean);
+ CMSetProperty(ci, "CIMValidated", &bul, CMPI_boolean);
+
CMReturnInstance(rslt, ci);
_SFCB_RETURN(st);
@@ -648,7 +661,7 @@ ServiceProviderGetInstance(CMPIInstanceMI * mi,
if (strcasecmp(className, "cim_objectmanager") == 0)
return ObjectManagerProviderEnumInstances(mi, ctx, rslt, ref,
properties);
- if (strcasecmp(className, "cim_objectmanagercommunicationMechanism")
+ if (strcasecmp(className, "sfcb_cimxmlcommunicationMechanism")
== 0)
return ComMechProviderEnumInstances(mi, ctx, rslt, ref,
properties);
@@ -693,9 +706,9 @@ ServerProviderGetInstance(CMPIInstanceMI * mi,
return ServiceProviderGetInstance(mi, ctx, rslt, ref, properties,
"cim_objectmanager");
if (strcasecmp
- ((char *) cls->hdl, "cim_objectmanagercommunicationMechanism") == 0)
+ ((char *) cls->hdl, "sfcb_cimxmlcommunicationMechanism") == 0)
return ServiceProviderGetInstance(mi, ctx, rslt, ref, properties,
- "cim_objectmanagercommunicationMechanism");
+ "sfcb_cimxmlcommunicationMechanism");
if (strcasecmp((char *) cls->hdl, "cim_indicationservice") == 0)
return ServiceProviderGetInstance(mi, ctx, rslt, ref, properties,
"cim_indicationservice");
@@ -724,7 +737,7 @@ ServerProviderEnumInstanceNames(CMPIInstanceMI * mi,
"CIM_ObjectManager",
"CIM_ComputerSystem");
if (strcasecmp
- ((char *) cls->hdl, "cim_objectmanagercommunicationMechanism") == 0)
+ ((char *) cls->hdl, "sfcb_cimxmlcommunicationMechanism") == 0)
return ComMechProviderEnumInstanceNames(mi, ctx, rslt, ref);
if (strcasecmp((char *) cls->hdl, "cim_indicationservice") == 0)
return ServiceProviderEnumInstanceNames(mi, ctx, rslt, ref,
@@ -757,7 +770,7 @@ ServerProviderEnumInstances(CMPIInstanceMI * mi,
return ObjectManagerProviderEnumInstances(mi, ctx, rslt, ref,
properties);
if (strcasecmp
- ((char *) cls->hdl, "cim_objectmanagercommunicationMechanism") == 0)
+ ((char *) cls->hdl, "sfcb_cimxmlcommunicationMechanism") == 0)
return ComMechProviderEnumInstances(mi, ctx, rslt, ref, properties);
if (strcasecmp((char *) cls->hdl, "cim_interopservice") == 0) /* do we *
* still *
diff --git a/test/xmltest/enumerateinstancenames.ComMech.lines b/test/xmltest/enumerateinstancenames.ComMech.lines
index c71c6b9..502fd19 100644
--- a/test/xmltest/enumerateinstancenames.ComMech.lines
+++ b/test/xmltest/enumerateinstancenames.ComMech.lines
@@ -1,8 +1,8 @@
-<INSTANCENAME CLASSNAME="CIM_ObjectManagerCommunicationMechanism">
+<INSTANCENAME CLASSNAME="SFCB_CIMXMLCommunicationMechanism">
<KEYBINDING NAME="SystemCreationClassName">
<KEYVALUE VALUETYPE="string">CIM_ObjectManager</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="CreationClassName">
-<KEYVALUE VALUETYPE="string">CIM_ObjectManagerCommunicationMechanism</KEYVALUE>
+<KEYVALUE VALUETYPE="string">SFCB_CIMXMLCommunicationMechanism</KEYVALUE>
</KEYBINDING>
</INSTANCENAME>
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
