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

Revision: 1159
          http://omc.svn.sourceforge.net/omc/?rev=1159&view=rev
Author:   bartw
Date:     2008-11-07 22:44:18 +0000 (Fri, 07 Nov 2008)

Log Message:
-----------
fixed location of README in CMakeLists.txt

Modified Paths:
--------------
    cmpi-bindings/trunk/CMakeLists.txt

Modified: cmpi-bindings/trunk/CMakeLists.txt
===================================================================
--- cmpi-bindings/trunk/CMakeLists.txt	2008-11-07 20:38:27 UTC (rev 1158)
+++ cmpi-bindings/trunk/CMakeLists.txt	2008-11-07 22:44:18 UTC (rev 1159)
@@ -48,7 +48,7 @@
 
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Language Bindings for CMPI")
 SET(CPACK_PACKAGE_VENDOR "Novell Inc.")
-SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/doc/README")
+SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
 SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.BSD")
 SET(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
 SET(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})


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

Revision: 1158
          http://omc.svn.sourceforge.net/omc/?rev=1158&view=rev
Author:   bartw
Date:     2008-11-07 20:38:27 +0000 (Fri, 07 Nov 2008)

Log Message:
-----------
added another check

Modified Paths:
--------------
    cmpi-bindings/trunk/test/python/TestMethod_Test.py

Modified: cmpi-bindings/trunk/test/python/TestMethod_Test.py
===================================================================
--- cmpi-bindings/trunk/test/python/TestMethod_Test.py	2008-11-07 17:59:32 UTC (rev 1157)
+++ cmpi-bindings/trunk/test/python/TestMethod_Test.py	2008-11-07 20:38:27 UTC (rev 1158)
@@ -424,6 +424,7 @@
         ra = 'one,two,three,four'
         rv, outs = self.conn.InvokeMethod('strSplit', 'Test_Method', 
                 str=ra, sep=',')
+        self.assertEquals(outs['nelems'], 4)
         self.assertEquals(outs['elems'], ra.split(','))
         self.assertTrue(ra)
 


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

Revision: 1157
          http://omc.svn.sourceforge.net/omc/?rev=1157&view=rev
Author:   bartw
Date:     2008-11-07 17:59:32 +0000 (Fri, 07 Nov 2008)

Log Message:
-----------
change import order

Modified Paths:
--------------
    cmpi-bindings/trunk/swig/python/cmpi_pywbem_bindings.py

Modified: cmpi-bindings/trunk/swig/python/cmpi_pywbem_bindings.py
===================================================================
--- cmpi-bindings/trunk/swig/python/cmpi_pywbem_bindings.py	2008-11-07 15:37:40 UTC (rev 1156)
+++ cmpi-bindings/trunk/swig/python/cmpi_pywbem_bindings.py	2008-11-07 17:59:32 UTC (rev 1157)
@@ -31,15 +31,15 @@
 
 # Author: Bart Whiteley <bwhiteley suse.de>
 
-import cmpi
-
-
 from pywbem.cim_provider2 import ProviderProxy
 import pywbem
 import types
 import syslog
 import sys
 
+
+import cmpi
+
 ##==============================================================================
 ##
 ## _exception_to_error()


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

Revision: 1156
          http://omc.svn.sourceforge.net/omc/?rev=1156&view=rev
Author:   jcarey
Date:     2008-11-07 15:37:40 +0000 (Fri, 07 Nov 2008)

Log Message:
-----------
Added code to avoid validation of properties if they are NULL

Modified Paths:
--------------
    contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmcreation-data.c

Modified: contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmcreation-data.c
===================================================================
--- contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmcreation-data.c	2008-11-07 11:03:43 UTC (rev 1155)
+++ contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmcreation-data.c	2008-11-07 15:37:40 UTC (rev 1156)
@@ -326,25 +326,29 @@
 }
 
 /*****************************************************************************/
-static void
+static int
 add_u8_prop_to_query(cmpiutilStrBuf* pstrbuf, const CMPIInstance* instance,
 		const char* prop_name)
 {
+	int cc = 0;
 	CMPIData data = CMGetProperty(instance, prop_name, NULL);
 	if (!CMIsNullValue(data)) {
 		char wkbfr[32];
 		snprintf(wkbfr, sizeof(wkbfr), "%u,", data.value.uint8);
 		cmpiutilStrBuf_cat(pstrbuf, wkbfr, 0);
+		cc = 1;
 	} else {
 		cmpiutilStrBuf_cat(pstrbuf, "NULL,", 0);
 	}
+	return cc;
 }
 
 /*****************************************************************************/
-static void
+static int
 add_u16_prop_to_query(cmpiutilStrBuf* pstrbuf, const CMPIInstance* instance,
 		const char* prop_name, CMPIData *pdata, int endstmt)
 {
+	int cc = 0;
 	CMPIData data;
 	const char* pnnfmt;
 	const char* pnullfmt;
@@ -364,16 +368,19 @@
 		char wkbfr[32];
 		snprintf(wkbfr, sizeof(wkbfr), pnnfmt, pdata->value.uint16);
 		cmpiutilStrBuf_cat(pstrbuf, wkbfr, 0);
+		cc = 1;
 	} else {
 		cmpiutilStrBuf_cat(pstrbuf, pnullfmt, 0);
 	}
+	return cc;
 }
 
 /*****************************************************************************/
-static void
+static int
 add_u32_prop_to_query(cmpiutilStrBuf* pstrbuf, const CMPIInstance* instance,
 		const char* prop_name, CMPIData* pdata)
 {
+	int cc = 0;
 	CMPIData data;
 	if (!pdata) {
 		pdata = &data;
@@ -384,16 +391,19 @@
 		char wkbfr[32];
 		snprintf(wkbfr, sizeof(wkbfr), "%u,", pdata->value.uint32);
 		cmpiutilStrBuf_cat(pstrbuf, wkbfr, 0);
+		cc = 1;
 	} else {
 		cmpiutilStrBuf_cat(pstrbuf, "NULL,", 0);
 	}
+	return cc;
 }
 
 /*****************************************************************************/
-static void
+static int
 add_str_prop_to_query(cmpiutilStrBuf* pstrbuf, const CMPIInstance* instance,
 		const char* prop_name, int endstmt)
 {
+	int cc = 0;
 	CMPIData data;
 	const char* pnnfmt;
 	const char* pnullfmt;
@@ -408,16 +418,19 @@
 	if (!CMIsNullValue(data)) {
 		char *p = (char*) CMGetCharPtr(data.value.string);
 		db_sql_insert(pstrbuf, pnnfmt, p);
+		cc = 1;
 	} else {
 		cmpiutilStrBuf_cat(pstrbuf, pnullfmt, 0);
 	}
+	return cc;
 }
 
 /*****************************************************************************/
-static void
+static int
 add_stra_prop_to_query(cmpiutilStrBuf* pstrbuf, const CMPIInstance* instance,
 		const char* prop_name)
 {
+	int cc = 0;
 	CMPIData data = CMGetProperty(instance, prop_name, NULL);
 	if (!CMIsNullValue(data)) {
 		cmpiutilStrBuf* lstrbuf = stringArray2Str(_broker, data.value.array);
@@ -427,9 +440,11 @@
 		} else {
 			cmpiutilStrBuf_cat(pstrbuf, "NULL,", 0);
 		}
+		cc = 1;
 	} else {
 		cmpiutilStrBuf_cat(pstrbuf, "NULL,", 0);
 	}
+	return cc;
 }
 
 
@@ -708,7 +723,7 @@
 
 
 /*****************************************************************************/
-void
+int
 mod_add_u16_prop(cmpiutilStrArray* pstra, const CMPIInstance* modified_instance,
 		const char* prop_name, const char** properties, CMPIData* pdata)
 {
@@ -719,7 +734,7 @@
 		pdata = &data;
 	}
 	if (!get_mod_property(modified_instance, prop_name, properties, pdata)) {
-		return;
+		return 0;
 	}
 	if (!CMIsNullValue((*pdata))) {
 		snprintf(wkbfr, sizeof(wkbfr), "%s=%u", prop_name, pdata->value.uint16);
@@ -727,17 +742,18 @@
 		snprintf(wkbfr, sizeof(wkbfr), "%s=NULL", prop_name);
 	}
 	cmpiutilStrArray_append(pstra, wkbfr);
+	return 1;
 }
 
 /*****************************************************************************/
-void
+int
 mod_add_u8_prop(cmpiutilStrArray* pstra, const CMPIInstance* modified_instance,
 		const char* prop_name, const char** properties)
 {
 	char wkbfr[256];
 	CMPIData data;
 	if (!get_mod_property(modified_instance, prop_name, properties, &data)) {
-		return;
+		return 0;
 	}
 	if (!CMIsNullValue(data)) {
 		snprintf(wkbfr, sizeof(wkbfr), "%s=%u", prop_name, data.value.uint8);
@@ -745,16 +761,17 @@
 		snprintf(wkbfr, sizeof(wkbfr), "%s=NULL", prop_name);
 	}
 	cmpiutilStrArray_append(pstra, wkbfr);
+	return 1;
 }
 
 /*****************************************************************************/
-void
+int
 mod_add_str_prop(cmpiutilStrArray* pstra, const CMPIInstance* modified_instance,
 		const char* prop_name, const char** properties)
 {
 	CMPIData data;
 	if (!get_mod_property(modified_instance, prop_name, properties, &data)) {
-		return;
+		return 0;
 	}
 	if (!CMIsNullValue(data)) {
 		char *p = (char*) CMGetCharPtr(data.value.string);
@@ -766,16 +783,17 @@
 		snprintf(wkbfr, sizeof(wkbfr), "%s=NULL", prop_name);
 		cmpiutilStrArray_append(pstra, wkbfr);
 	}
+	return 1;
 }
 
 /*****************************************************************************/
-void
+int
 mod_add_stra_prop(cmpiutilStrArray* pstra, const CMPIInstance* modified_instance,
 		const char* prop_name, const char** properties)
 {
 	CMPIData data;
 	if (!get_mod_property(modified_instance, prop_name, properties, &data)) {
-		return;
+		return 0;
 	}
 	if (!CMIsNullValue(data)) {
 		cmpiutilStrBuf* lstrbuf = stringArray2Str(_broker, data.value.array);
@@ -794,10 +812,11 @@
 		snprintf(wkbfr, sizeof(wkbfr), "%s=NULL", prop_name);
 		cmpiutilStrArray_append(pstra, wkbfr);
 	}
+	return 1;
 }
 
 /*****************************************************************************/
-void
+int
 mod_add_u32_prop(cmpiutilStrArray* pstra, const CMPIInstance* modified_instance,
 		const char* prop_name, const char** properties, CMPIData* pdata)
 {
@@ -808,7 +827,7 @@
 		pdata = &data;
 	}
 	if (!get_mod_property(modified_instance, prop_name, properties, pdata)) {
-		return;
+		return 0;
 	}
 	if (!CMIsNullValue((*pdata))) {
 		snprintf(wkbfr, sizeof(wkbfr), "%s=%u", prop_name, pdata->value.uint32);
@@ -816,6 +835,7 @@
 		snprintf(wkbfr, sizeof(wkbfr), "%s=NULL", prop_name);
 	}
 	cmpiutilStrArray_append(pstra, wkbfr);
+	return 1;
 }
 
 /******************************************************************************
@@ -897,20 +917,23 @@
 			return status;
 		}
 
-		mod_add_u16_prop(pstra, modified_instance, "AutoMaticRecoveryAction", properties, &data);
-		if (valid_automatic_recovery_action(&data, &status) != CMPI_RC_OK) {
-			cmpiutilStrArray_destroy(pstra);
-			return status;
+		if (mod_add_u16_prop(pstra, modified_instance, "AutoMaticRecoveryAction", properties, &data)) {
+			if (valid_automatic_recovery_action(&data, &status) != CMPI_RC_OK) {
+				cmpiutilStrArray_destroy(pstra);
+				return status;
+			}
 		}
-		mod_add_u16_prop(pstra, modified_instance, "AutoMaticShutdownAction", properties, &data);
-		if (valid_automatic_shutdown_action(&data, &status) != CMPI_RC_OK) {
-			cmpiutilStrArray_destroy(pstra);
-			return status;
+		if (mod_add_u16_prop(pstra, modified_instance, "AutoMaticShutdownAction", properties, &data)) {
+			if (valid_automatic_shutdown_action(&data, &status) != CMPI_RC_OK) {
+				cmpiutilStrArray_destroy(pstra);
+				return status;
+			}
 		}
-		mod_add_u16_prop(pstra, modified_instance, "AutoMaticStartupAction", properties, &data);
-		if (valid_automatic_startup_action(&data, &status) != CMPI_RC_OK) {
-			cmpiutilStrArray_destroy(pstra);
-			return status;
+		if (mod_add_u16_prop(pstra, modified_instance, "AutoMaticStartupAction", properties, &data)) {
+			if (valid_automatic_startup_action(&data, &status) != CMPI_RC_OK) {
+				cmpiutilStrArray_destroy(pstra);
+				return status;
+			}
 		}
 		if (get_mod_property(modified_instance, "AutoMaticStartupActionDelay", properties, &data)) {
 			if (!CMIsNullValue(data)) {
@@ -932,10 +955,11 @@
 			"AutomaticStartupActionSequenceNumber", properties, NULL);
 		mod_add_str_prop(pstra, modified_instance, "CPUArchitecture", properties);
 		mod_add_str_prop(pstra, modified_instance, "Caption", properties);
-		mod_add_u16_prop(pstra, modified_instance, "ChangeableType", properties, &data);
-		if (valid_changeable_type(&data, &status) != CMPI_RC_OK) {
-			cmpiutilStrArray_destroy(pstra);
-			return status;
+		if (mod_add_u16_prop(pstra, modified_instance, "ChangeableType", properties, &data)) {
+			if (valid_changeable_type(&data, &status) != CMPI_RC_OK) {
+				cmpiutilStrArray_destroy(pstra);
+				return status;
+			}
 		}
 		mod_add_str_prop(pstra, modified_instance, "ConfigurationDataRoot", properties);
 		mod_add_str_prop(pstra, modified_instance, "ConfigurationFile", properties);
@@ -962,15 +986,17 @@
 		mod_add_str_prop(pstra, modified_instance, "ElementName", properties);
 		mod_add_stra_prop(pstra, modified_instance, "ExtraConfigInfo", properties);
 		mod_add_str_prop(pstra, modified_instance, "ExtraInstallArgs", properties);
-		mod_add_u32_prop(pstra, modified_instance, "GraphicsType", properties, &data);
-		if (valid_graphics_type(&data, &status) != CMPI_RC_OK) {
-			cmpiutilStrArray_destroy(pstra);
-			return status;
+		if (mod_add_u32_prop(pstra, modified_instance, "GraphicsType", properties, &data)) {
+			if (valid_graphics_type(&data, &status) != CMPI_RC_OK) {
+				cmpiutilStrArray_destroy(pstra);
+				return status;
+			}
 		}
-		mod_add_u32_prop(pstra, modified_instance, "GraphicsViewerType", properties, &data);
-		if (valid_graphics_viewer_type(&data, &status) != CMPI_RC_OK) {
-			cmpiutilStrArray_destroy(pstra);
-			return status;
+		if (mod_add_u32_prop(pstra, modified_instance, "GraphicsViewerType", properties, &data)) {
+			if (valid_graphics_viewer_type(&data, &status) != CMPI_RC_OK) {
+				cmpiutilStrArray_destroy(pstra);
+				return status;
+			}
 		}
 		mod_add_str_prop(pstra, modified_instance, "LogDataRoot", properties);
 		mod_add_u32_prop(pstra, modified_instance, "MaxMemory", properties, NULL);
@@ -978,10 +1004,11 @@
 		mod_add_stra_prop(pstra, modified_instance, "Nics", properties);
 		mod_add_stra_prop(pstra, modified_instance, "Notes", properties);
 		mod_add_u8_prop(pstra, modified_instance, "NumVCPUs", properties);
-		mod_add_u32_prop(pstra, modified_instance, "OSType", properties, &data);
-		if (valid_os_type(&data, &status) != CMPI_RC_OK) {
-			cmpiutilStrArray_destroy(pstra);
-			return status;
+		if (mod_add_u32_prop(pstra, modified_instance, "OSType", properties, &data)) {
+			if (valid_os_type(&data, &status) != CMPI_RC_OK) {
+				cmpiutilStrArray_destroy(pstra);
+				return status;
+			}
 		}
 		mod_add_str_prop(pstra, modified_instance, "RecoveryFile", properties);
 		mod_add_str_prop(pstra, modified_instance, "ResponseFile", properties);
@@ -991,32 +1018,32 @@
 		mod_add_str_prop(pstra, modified_instance, "SwapFileDataRoot", properties);
 		mod_add_u32_prop(pstra, modified_instance, "VNCPort", properties, NULL);
 		mod_add_str_prop(pstra, modified_instance, "VNCPassword", properties);
-		mod_add_u32_prop(pstra, modified_instance, "VirtType", properties, &data);
-		if (valid_virt_type(&data, &status) != CMPI_RC_OK) {
-			cmpiutilStrArray_destroy(pstra);
-			return status;
+		if (mod_add_u32_prop(pstra, modified_instance, "VirtType", properties, &data)) {
+			if (valid_virt_type(&data, &status) != CMPI_RC_OK) {
+				cmpiutilStrArray_destroy(pstra);
+				return status;
+			}
 		}
 		mod_add_str_prop(pstra, modified_instance, "VirtualSystemIdentifier", properties);
 		mod_add_str_prop(pstra, modified_instance, "VirtualSystemType", properties);
-
-		mod_add_u16_prop(pstra, modified_instance, "OnPowerOff", properties, &data);
-		if (valid_on_power_off(&data, &status) != CMPI_RC_OK) {
-			cmpiutilStrArray_destroy(pstra);
-			return status;
+		if (mod_add_u16_prop(pstra, modified_instance, "OnPowerOff", properties, &data)) {
+			if (valid_on_power_off(&data, &status) != CMPI_RC_OK) {
+				cmpiutilStrArray_destroy(pstra);
+				return status;
+			}
 		}
-
-		mod_add_u16_prop(pstra, modified_instance, "OnReboot", properties, &data);
-		if (valid_on_reboot(&data, &status) != CMPI_RC_OK) {
-			cmpiutilStrArray_destroy(pstra);
-			return status;
+		if (mod_add_u16_prop(pstra, modified_instance, "OnReboot", properties, &data)) {
+			if (valid_on_reboot(&data, &status) != CMPI_RC_OK) {
+				cmpiutilStrArray_destroy(pstra);
+				return status;
+			}
 		}
-
-		mod_add_u16_prop(pstra, modified_instance, "OnCrash", properties, &data);
-		if (valid_on_crash(&data, &status) != CMPI_RC_OK) {
-			cmpiutilStrArray_destroy(pstra);
-			return status;
+		if (mod_add_u16_prop(pstra, modified_instance, "OnCrash", properties, &data)) {
+			if (valid_on_crash(&data, &status) != CMPI_RC_OK) {
+				cmpiutilStrArray_destroy(pstra);
+				return status;
+			}
 		}
-
 		pstrbuf = cmpiutilStrBuf_create();
 		if (!pstrbuf) {
 			CMSetStatusWithChars(_broker, &status, CMPI_RC_ERROR_SYSTEM,
@@ -1106,20 +1133,23 @@
 		cmpiutilStrBuf_cat(pstrbuf, ") VALUES (", 0);
 		db_sql_insert(pstrbuf, "%Q,", iid);
 
-		add_u16_prop_to_query(pstrbuf, newinstance, "AutoMaticRecoveryAction", &data, 0);
-		if (valid_automatic_recovery_action(&data, &status) != CMPI_RC_OK) {
-			cmpiutilStrBuf_destroy(pstrbuf);
-			return status;
+		if (add_u16_prop_to_query(pstrbuf, newinstance, "AutoMaticRecoveryAction", &data, 0)) {
+			if (valid_automatic_recovery_action(&data, &status) != CMPI_RC_OK) {
+				cmpiutilStrBuf_destroy(pstrbuf);
+				return status;
+			}
 		}
-		add_u16_prop_to_query(pstrbuf, newinstance, "AutoMaticShutdownAction", &data, 0);
-		if (valid_automatic_shutdown_action(&data, &status) != CMPI_RC_OK) {
-			cmpiutilStrBuf_destroy(pstrbuf);
-			return status;
+		if (add_u16_prop_to_query(pstrbuf, newinstance, "AutoMaticShutdownAction", &data, 0)) {
+			if (valid_automatic_shutdown_action(&data, &status) != CMPI_RC_OK) {
+				cmpiutilStrBuf_destroy(pstrbuf);
+				return status;
+			}
 		}
-		add_u16_prop_to_query(pstrbuf, newinstance, "AutoMaticStartupAction", &data, 0);
-		if (valid_automatic_startup_action(&data, &status) != CMPI_RC_OK) {
-			cmpiutilStrBuf_destroy(pstrbuf);
-			return status;
+		if (add_u16_prop_to_query(pstrbuf, newinstance, "AutoMaticStartupAction", &data, 0)) {
+			if (valid_automatic_startup_action(&data, &status) != CMPI_RC_OK) {
+				cmpiutilStrBuf_destroy(pstrbuf);
+				return status;
+			}
 		}
 		data = CMGetProperty(newinstance, "AutoMaticStartupActionDelay", NULL);
 		if (!CMIsNullValue(data)) {
@@ -1141,10 +1171,11 @@
 		add_u16_prop_to_query(pstrbuf, newinstance, "AutoMaticStartupActionSequenceNumber", NULL, 0);
 		add_str_prop_to_query(pstrbuf, newinstance, "CPUArchitecture", 0);
 		add_str_prop_to_query(pstrbuf, newinstance, "Caption", 0);
-		add_u16_prop_to_query(pstrbuf, newinstance, "ChangeableType", &data, 0);
-		if (valid_changeable_type(&data, &status) != CMPI_RC_OK) {
-			cmpiutilStrBuf_destroy(pstrbuf);
-			return status;
+		if (add_u16_prop_to_query(pstrbuf, newinstance, "ChangeableType", &data, 0)) {
+			if (valid_changeable_type(&data, &status) != CMPI_RC_OK) {
+				cmpiutilStrBuf_destroy(pstrbuf);
+				return status;
+			}
 		}
 		add_str_prop_to_query(pstrbuf, newinstance, "ConfigurationDataRoot", 0);
 		add_str_prop_to_query(pstrbuf, newinstance, "ConfigurationFile", 0);
@@ -1173,15 +1204,17 @@
 		add_str_prop_to_query(pstrbuf, newinstance, "ElementName", 0);
 		add_stra_prop_to_query(pstrbuf, newinstance, "ExtraConfigInfo");
 		add_str_prop_to_query(pstrbuf, newinstance, "ExtraInstallArgs", 0);
-		add_u32_prop_to_query(pstrbuf, newinstance, "GraphicsType", &data);
-		if (valid_graphics_type(&data, &status) != CMPI_RC_OK) {
-			cmpiutilStrBuf_destroy(pstrbuf);
-			return status;
+		if (add_u32_prop_to_query(pstrbuf, newinstance, "GraphicsType", &data)) {
+			if (valid_graphics_type(&data, &status) != CMPI_RC_OK) {
+				cmpiutilStrBuf_destroy(pstrbuf);
+				return status;
+			}
 		}
-		add_u32_prop_to_query(pstrbuf, newinstance, "GraphicsViewerType", &data);
-		if (valid_graphics_viewer_type(&data, &status) != CMPI_RC_OK) {
-			cmpiutilStrBuf_destroy(pstrbuf);
-			return status;
+		if (add_u32_prop_to_query(pstrbuf, newinstance, "GraphicsViewerType", &data)) {
+			if (valid_graphics_viewer_type(&data, &status) != CMPI_RC_OK) {
+				cmpiutilStrBuf_destroy(pstrbuf);
+				return status;
+			}
 		}
 		add_str_prop_to_query(pstrbuf, newinstance, "LogDataRoot", 0);
 		add_u32_prop_to_query(pstrbuf, newinstance, "MaxMemory", NULL);
@@ -1189,10 +1222,11 @@
 		add_stra_prop_to_query(pstrbuf, newinstance, "Nics");
 		add_stra_prop_to_query(pstrbuf, newinstance, "Notes");
 		add_u8_prop_to_query(pstrbuf, newinstance, "NumVCPUs");
-		add_u32_prop_to_query(pstrbuf, newinstance, "OSType", &data);
-		if (valid_os_type(&data, &status) != CMPI_RC_OK) {
-			cmpiutilStrBuf_destroy(pstrbuf);
-			return status;
+		if (add_u32_prop_to_query(pstrbuf, newinstance, "OSType", &data)) {
+			if (valid_os_type(&data, &status) != CMPI_RC_OK) {
+				cmpiutilStrBuf_destroy(pstrbuf);
+				return status;
+			}
 		}
 		add_str_prop_to_query(pstrbuf, newinstance, "RecoveryFile", 0);
 		add_str_prop_to_query(pstrbuf, newinstance, "ResponseFile", 0);
@@ -1202,27 +1236,31 @@
 		add_str_prop_to_query(pstrbuf, newinstance, "SwapFileDataRoot", 0);
 		add_u32_prop_to_query(pstrbuf, newinstance, "VNCPort", NULL);
 		add_str_prop_to_query(pstrbuf, newinstance, "VNCPassword", 0);
-		add_u32_prop_to_query(pstrbuf, newinstance, "VirtType", &data);
-		if (valid_virt_type(&data, &status) != CMPI_RC_OK) {
-			cmpiutilStrBuf_destroy(pstrbuf);
-			return status;
+		if (add_u32_prop_to_query(pstrbuf, newinstance, "VirtType", &data)) {
+			if (valid_virt_type(&data, &status) != CMPI_RC_OK) {
+				cmpiutilStrBuf_destroy(pstrbuf);
+				return status;
+			}
 		}
 		add_str_prop_to_query(pstrbuf, newinstance, "VirtualSystemIdentifier", 0);
 		add_str_prop_to_query(pstrbuf, newinstance, "VirtualSystemType", 0);
-		add_u16_prop_to_query(pstrbuf, newinstance, "OnPowerOff", &data, 0);
-		if (valid_on_power_off(&data, &status) != CMPI_RC_OK) {
-			cmpiutilStrBuf_destroy(pstrbuf);
-			return status;
+		if (add_u16_prop_to_query(pstrbuf, newinstance, "OnPowerOff", &data, 0)) {
+			if (valid_on_power_off(&data, &status) != CMPI_RC_OK) {
+				cmpiutilStrBuf_destroy(pstrbuf);
+				return status;
+			}
 		}
-		add_u16_prop_to_query(pstrbuf, newinstance, "OnReboot", &data, 0);
-		if (valid_on_reboot(&data, &status) != CMPI_RC_OK) {
-			cmpiutilStrBuf_destroy(pstrbuf);
-			return status;
+		if (add_u16_prop_to_query(pstrbuf, newinstance, "OnReboot", &data, 0)) {
+			if (valid_on_reboot(&data, &status) != CMPI_RC_OK) {
+				cmpiutilStrBuf_destroy(pstrbuf);
+				return status;
+			}
 		}
-		add_u16_prop_to_query(pstrbuf, newinstance, "OnCrash", &data, 1);
-		if (valid_on_crash(&data, &status) != CMPI_RC_OK) {
-			cmpiutilStrBuf_destroy(pstrbuf);
-			return status;
+		if (add_u16_prop_to_query(pstrbuf, newinstance, "OnCrash", &data, 1)) {
+			if (valid_on_crash(&data, &status) != CMPI_RC_OK) {
+				cmpiutilStrBuf_destroy(pstrbuf);
+				return status;
+			}
 		}
 		cmpiutilStrBuf_cat(pstrbuf, ");", 0);
 


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

Revision: 1155
          http://omc.svn.sourceforge.net/omc/?rev=1155&view=rev
Author:   kkaempf
Date:     2008-11-07 11:03:43 +0000 (Fri, 07 Nov 2008)

Log Message:
-----------
don't call Py_DecRef on NULL

Modified Paths:
--------------
    cmpi-bindings/trunk/src/target_python.c

Modified: cmpi-bindings/trunk/src/target_python.c
===================================================================
--- cmpi-bindings/trunk/src/target_python.c	2008-11-06 16:28:25 UTC (rev 1154)
+++ cmpi-bindings/trunk/src/target_python.c	2008-11-07 11:03:43 UTC (rev 1155)
@@ -295,9 +295,9 @@
     }
     rc = pi != 0; 
 cleanup:
-    Py_DecRef(pyargs);
-    Py_DecRef(pyfunc);
-    Py_DecRef(prv);
+    if (pyargs) Py_DecRef(pyargs);
+    if (pyfunc) Py_DecRef(pyfunc);
+    if (prv) Py_DecRef(prv);
  
     return rc; 
 }


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

Revision: 1154
          http://omc.svn.sourceforge.net/omc/?rev=1154&view=rev
Author:   kkaempf
Date:     2008-11-06 16:28:25 +0000 (Thu, 06 Nov 2008)

Log Message:
-----------
add copyright notice

Modified Paths:
--------------
    cmpi-bindings/trunk/src/target_perl.c
    cmpi-bindings/trunk/src/target_python.c
    cmpi-bindings/trunk/src/target_ruby.c

Modified: cmpi-bindings/trunk/src/target_perl.c
===================================================================
--- cmpi-bindings/trunk/src/target_perl.c	2008-11-06 14:41:43 UTC (rev 1153)
+++ cmpi-bindings/trunk/src/target_perl.c	2008-11-06 16:28:25 UTC (rev 1154)
@@ -6,6 +6,37 @@
  * Here: Perl
  */
 
+/*****************************************************************************
+* Copyright (C) 2008 Novell Inc. All rights reserved.
+* Copyright (C) 2008 SUSE Linux Products GmbH. All rights reserved.
+* 
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* 
+*   - Redistributions of source code must retain the above copyright notice,
+*     this list of conditions and the following disclaimer.
+* 
+*   - Redistributions in binary form must reproduce the above copyright notice,
+*     this list of conditions and the following disclaimer in the documentation
+*     and/or other materials provided with the distribution.
+* 
+*   - Neither the name of Novell Inc. nor of SUSE Linux Products GmbH nor the
+*     names of its contributors may be used to endorse or promote products
+*     derived from this software without specific prior written permission.
+* 
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED. IN NO EVENT SHALL Novell Inc. OR SUSE Linux Products GmbH OR
+* THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
+* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 
+* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*****************************************************************************/
+
 /* load <RB_BINDINGS_FILE>.pl */
 #define PL_BINDINGS_FILE "cmpi_plwbem_bindings"
 

Modified: cmpi-bindings/trunk/src/target_python.c
===================================================================
--- cmpi-bindings/trunk/src/target_python.c	2008-11-06 14:41:43 UTC (rev 1153)
+++ cmpi-bindings/trunk/src/target_python.c	2008-11-06 16:28:25 UTC (rev 1154)
@@ -6,6 +6,36 @@
  * Here: Python
  */
 
+/*****************************************************************************
+* Copyright (C) 2008 Novell Inc. All rights reserved.
+* Copyright (C) 2008 SUSE Linux Products GmbH. All rights reserved.
+* 
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* 
+*   - Redistributions of source code must retain the above copyright notice,
+*     this list of conditions and the following disclaimer.
+* 
+*   - Redistributions in binary form must reproduce the above copyright notice,
+*     this list of conditions and the following disclaimer in the documentation
+*     and/or other materials provided with the distribution.
+* 
+*   - Neither the name of Novell Inc. nor of SUSE Linux Products GmbH nor the
+*     names of its contributors may be used to endorse or promote products
+*     derived from this software without specific prior written permission.
+* 
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED. IN NO EVENT SHALL Novell Inc. OR SUSE Linux Products GmbH OR
+* THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
+* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 
+* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*****************************************************************************/
 
 #include <Python.h>
 

Modified: cmpi-bindings/trunk/src/target_ruby.c
===================================================================
--- cmpi-bindings/trunk/src/target_ruby.c	2008-11-06 14:41:43 UTC (rev 1153)
+++ cmpi-bindings/trunk/src/target_ruby.c	2008-11-06 16:28:25 UTC (rev 1154)
@@ -6,6 +6,37 @@
  * Here: Ruby
  */
 
+/*****************************************************************************
+* Copyright (C) 2008 Novell Inc. All rights reserved.
+* Copyright (C) 2008 SUSE Linux Products GmbH. All rights reserved.
+* 
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* 
+*   - Redistributions of source code must retain the above copyright notice,
+*     this list of conditions and the following disclaimer.
+* 
+*   - Redistributions in binary form must reproduce the above copyright notice,
+*     this list of conditions and the following disclaimer in the documentation
+*     and/or other materials provided with the distribution.
+* 
+*   - Neither the name of Novell Inc. nor of SUSE Linux Products GmbH nor the
+*     names of its contributors may be used to endorse or promote products
+*     derived from this software without specific prior written permission.
+* 
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED. IN NO EVENT SHALL Novell Inc. OR SUSE Linux Products GmbH OR
+* THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
+* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 
+* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*****************************************************************************/
+
 /* load <RB_BINDINGS_FILE>.rb */
 #define RB_BINDINGS_FILE "cmpi_rbwbem_bindings"
 


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

Revision: 1153
          http://omc.svn.sourceforge.net/omc/?rev=1153&view=rev
Author:   kkaempf
Date:     2008-11-06 14:41:43 +0000 (Thu, 06 Nov 2008)

Log Message:
-----------
improve naming

Added Paths:
-----------
    cmpi-bindings/trunk/doc/INTERNALS

Removed Paths:
-------------
    cmpi-bindings/trunk/doc/HOWTO

Deleted: cmpi-bindings/trunk/doc/HOWTO
===================================================================
--- cmpi-bindings/trunk/doc/HOWTO	2008-11-06 14:40:54 UTC (rev 1152)
+++ cmpi-bindings/trunk/doc/HOWTO	2008-11-06 14:41:43 UTC (rev 1153)
@@ -1,44 +0,0 @@
-CMPI providers with SWIG
-------------------------
-
-Problem statement
------------------
-
-SWIG (www.swig.org) is a bindings generator used to create language
-bindings (i.e. Perl, Ruby, Python) for C or C++ libraries.
-This makes library functions accessible from a foreign language.
-
-Using SWIG to create CMPI providers reverts the flow of control. This
-is usally from the foreign language to the C or C++ library. The SWIG
-bindings 'call into' the library.
-
-Writing CMPI providers in a foreign language reverts the calling
-process. The CIMOM call into functions implemented in the foreign
-language.
-
-
-Solution
---------
-
-The problem is solved by creating a shim layer, providing a CMPI API
-towards the CIMOM and transfering calls to this API through the SWIG
-bindings into the scripting language interpreter.
-
-This shim links with and initializes the target language interpreter.
-When loaded by the CIMOM, an init function is called. This in turn
-initializes the target interpreter and calls it to load the SWIG
-binding code.
-
-It then calls an initialization function (a singleton class) which
-provides hooks to fill the function pointer table defined by CMPI.
-
-
-Target language considerations
-------------------------------
-
-Implementing a provider needs information defined in the .mof file of
-the CIM class to be instrumented. Thus the target language
-implementation is best driven by a MOF parser. The concept to be
-used here is similar to SWIG, which uses a C/C++ parser to
-automatically generate bindings.
-

Copied: cmpi-bindings/trunk/doc/INTERNALS (from rev 1148, cmpi-bindings/trunk/doc/HOWTO)
===================================================================
--- cmpi-bindings/trunk/doc/INTERNALS	                        (rev 0)
+++ cmpi-bindings/trunk/doc/INTERNALS	2008-11-06 14:41:43 UTC (rev 1153)
@@ -0,0 +1,44 @@
+CMPI providers with SWIG
+------------------------
+
+Problem statement
+-----------------
+
+SWIG (www.swig.org) is a bindings generator used to create language
+bindings (i.e. Perl, Ruby, Python) for C or C++ libraries.
+This makes library functions accessible from a foreign language.
+
+Using SWIG to create CMPI providers reverts the flow of control. This
+is usally from the foreign language to the C or C++ library. The SWIG
+bindings 'call into' the library.
+
+Writing CMPI providers in a foreign language reverts the calling
+process. The CIMOM call into functions implemented in the foreign
+language.
+
+
+Solution
+--------
+
+The problem is solved by creating a shim layer, providing a CMPI API
+towards the CIMOM and transfering calls to this API through the SWIG
+bindings into the scripting language interpreter.
+
+This shim links with and initializes the target language interpreter.
+When loaded by the CIMOM, an init function is called. This in turn
+initializes the target interpreter and calls it to load the SWIG
+binding code.
+
+It then calls an initialization function (a singleton class) which
+provides hooks to fill the function pointer table defined by CMPI.
+
+
+Target language considerations
+------------------------------
+
+Implementing a provider needs information defined in the .mof file of
+the CIM class to be instrumented. Thus the target language
+implementation is best driven by a MOF parser. The concept to be
+used here is similar to SWIG, which uses a C/C++ parser to
+automatically generate bindings.
+


Property changes on: cmpi-bindings/trunk/doc/INTERNALS
___________________________________________________________________
Added: svn:mergeinfo
   + 


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

Revision: 1152
          http://omc.svn.sourceforge.net/omc/?rev=1152&view=rev
Author:   kkaempf
Date:     2008-11-06 14:40:54 +0000 (Thu, 06 Nov 2008)

Log Message:
-----------
remove obsolete file

Removed Paths:
-------------
    cmpi-bindings/trunk/doc/INSTALL

Deleted: cmpi-bindings/trunk/doc/INSTALL
===================================================================
--- cmpi-bindings/trunk/doc/INSTALL	2008-11-06 14:35:36 UTC (rev 1151)
+++ cmpi-bindings/trunk/doc/INSTALL	2008-11-06 14:40:54 UTC (rev 1152)
@@ -1,20 +0,0 @@
-Prerequisites
-
-- cmpi header files
-  (The ones from sfcb are broken, you can use those below include/cmpi)
-- a CIMOM (sfcb does nicely)
-- SWIG 1.3.x (I used 1.3.35)
-- Cmake (I used 2.4)
-- Ruby ( ruby, ruby-devel)
-- wbemcli (or any other way to access the CIMOM)
-
-Now do:
- cd cmpi-bindings
- mkdir build
- cd build
- cmake ..
- make
- sudo make install
- sudo sfcbrepos -f
- sfcbd
-	
\ No newline at end of file


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

Revision: 1151
          http://omc.svn.sourceforge.net/omc/?rev=1151&view=rev
Author:   kkaempf
Date:     2008-11-06 14:35:36 +0000 (Thu, 06 Nov 2008)

Log Message:
-----------
document some cmake flags

Modified Paths:
--------------
    cmpi-bindings/trunk/README

Modified: cmpi-bindings/trunk/README
===================================================================
--- cmpi-bindings/trunk/README	2008-11-06 14:35:17 UTC (rev 1150)
+++ cmpi-bindings/trunk/README	2008-11-06 14:35:36 UTC (rev 1151)
@@ -56,7 +56,7 @@
 
   Requirements
   ------------
-  cmake
+  cmake 2.4 or later
   python interface requires:  python-devel, pywbem-0.7.0
   perl interface requires: ?
   ruby interface requires: ruby-1.8 ruby-devel-1.8
@@ -69,6 +69,12 @@
   'make'
   'sudo make install'
 
+  You can pass various parameters to cmake to control the build, e.g.
+  cmake -DCMAKE_INSTALL_PREFIX=/usr/local
+        -DCMAKE_C_FLAGS_RELEASE:STRING="-Wall -O2 -g"
+        -DCMAKE_CXX_FLAGS_RELEASE:STRING="-Wall -O2 -g"
+        -DCMAKE_BUILD_TYPE=Release
+
   Test
   ----
   For each language, there is a test/<language> directory.


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

Revision: 1150
          http://omc.svn.sourceforge.net/omc/?rev=1150&view=rev
Author:   kkaempf
Date:     2008-11-06 14:35:17 +0000 (Thu, 06 Nov 2008)

Log Message:
-----------
keep gcc quite

Modified Paths:
--------------
    cmpi-bindings/trunk/swig/perl/CMakeLists.txt

Modified: cmpi-bindings/trunk/swig/perl/CMakeLists.txt
===================================================================
--- cmpi-bindings/trunk/swig/perl/CMakeLists.txt	2008-11-06 14:31:27 UTC (rev 1149)
+++ cmpi-bindings/trunk/swig/perl/CMakeLists.txt	2008-11-06 14:35:17 UTC (rev 1150)
@@ -40,6 +40,7 @@
 
 ADD_DEFINITIONS(-DCMPI_PLATFORM_LINUX_GENERIC_GNU -DCMPI_VERSION=200)
 ADD_DEFINITIONS(-DTARGET_PERL)
+ADD_DEFINITIONS(-Wno-nonnull)
 
 ADD_DEFINITIONS( ${PERL_CCFLAGS} -Wno-unused -Wno-error -Wno-nonnull)
 LINK_DIRECTORIES( ${PERL_CORE_DIR} )


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

Revision: 1149
          http://omc.svn.sourceforge.net/omc/?rev=1149&view=rev
Author:   kkaempf
Date:     2008-11-06 14:31:27 +0000 (Thu, 06 Nov 2008)

Log Message:
-----------
remove obsolete README

Removed Paths:
-------------
    cmpi-bindings/trunk/doc/README

Deleted: cmpi-bindings/trunk/doc/README
===================================================================
--- cmpi-bindings/trunk/doc/README	2008-11-05 23:31:12 UTC (rev 1148)
+++ cmpi-bindings/trunk/doc/README	2008-11-06 14:31:27 UTC (rev 1149)
@@ -1,8 +0,0 @@
-Support for Python is only rough. The Python interpreter and the
-Provider implementation get correctly loaded. But I do not know yet
-how to call a Python function from C.
-
-- (build and) install sfcbd
-- (build and) install sblim-wbemcli
-- build and install .
-- run 'wbemcli ei http://localhost/root/cimv2:Cmpi_Swig'


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

Revision: 1148
          http://omc.svn.sourceforge.net/omc/?rev=1148&view=rev
Author:   bartw
Date:     2008-11-05 23:31:12 +0000 (Wed, 05 Nov 2008)

Log Message:
-----------
better handling of cmpi_pywbem_bindings import

Modified Paths:
--------------
    cmpi-bindings/trunk/src/target_python.c

Modified: cmpi-bindings/trunk/src/target_python.c
===================================================================
--- cmpi-bindings/trunk/src/target_python.c	2008-11-05 19:45:32 UTC (rev 1147)
+++ cmpi-bindings/trunk/src/target_python.c	2008-11-05 23:31:12 UTC (rev 1148)
@@ -118,7 +118,6 @@
  * Global Python initializer
  * 
  * load the Python interpreter
- * import 'cmpi_pywbem_bindings' -> _TARGET_MODULE
  * init threads
  */
 
@@ -143,27 +142,6 @@
   cmpiMainPyThreadState = PyGILState_GetThisThreadState();
   PyEval_ReleaseThread(cmpiMainPyThreadState); 
   
-  TARGET_THREAD_BEGIN_BLOCK;
-  
-  /*
-   * import 'cmpi_pywbem_bindings'
-   */
-  
-  _TARGET_MODULE = PyImport_ImportModule("cmpi_pywbem_bindings");
-  if (_TARGET_MODULE == NULL)
-    {
-      TARGET_THREAD_END_BLOCK; 
-      _SBLIM_TRACE(1,("<%d/0x%x> Python: import cmpi_pywbem_bindings failed", getpid(), pthread_self()));
-	  CMPIString* trace = get_exc_trace(broker);
-      _SBLIM_TRACE(1,("<%d/0x%x> %s", getpid(), pthread_self(), 
-				  CMGetCharsPtr(trace, NULL)));
-      _CMPI_SETFAIL(trace); 
-      abort();
-      return -1; 
-    }
-  _SBLIM_TRACE(1,("<%d/0x%x> Python: _TARGET_MODULE at %p", getpid(), pthread_self(), _TARGET_MODULE));
-  
-  TARGET_THREAD_END_BLOCK; 
   _SBLIM_TRACE(1,("<%d/0x%x> PyGlobalInitialize() succeeded", getpid(), pthread_self())); 
   return 0; 
 }
@@ -296,6 +274,7 @@
 
 
 /*
+ * import 'cmpi_pywbem_bindings' 
  * local (per MI) Python initializer
  * keeps track of reference count
  */
@@ -314,9 +293,9 @@
   }
   /* import 'cmpi_pywbem_bindings' */
   rc = PyGlobalInitialize(hdl->broker, st); 
-  pthread_mutex_unlock(&_CMPI_INIT_MUTEX);
   if (rc != 0)
   {
+      pthread_mutex_unlock(&_CMPI_INIT_MUTEX);
       return rc; 
   }
 
@@ -324,6 +303,29 @@
   
   TARGET_THREAD_BEGIN_BLOCK;
   
+  /*
+   * import 'cmpi_pywbem_bindings'
+   */
+  
+  if (_TARGET_MODULE == NULL)
+  {
+	  _TARGET_MODULE = PyImport_ImportModule("cmpi_pywbem_bindings");
+	  if (_TARGET_MODULE == NULL)
+		{
+		  _SBLIM_TRACE(1,("<%d/0x%x> Python: import cmpi_pywbem_bindings failed", getpid(), pthread_self()));
+		  CMPIString* trace = get_exc_trace(hdl->broker);
+          PyErr_Clear(); 
+		  TARGET_THREAD_END_BLOCK; 
+		  _SBLIM_TRACE(1,("<%d/0x%x> %s", getpid(), pthread_self(), 
+					  CMGetCharsPtr(trace, NULL)));
+		  _CMPI_SETFAIL(trace); 
+		  pthread_mutex_unlock(&_CMPI_INIT_MUTEX);
+		  return -1; 
+		}
+    }
+    pthread_mutex_unlock(&_CMPI_INIT_MUTEX);
+  _SBLIM_TRACE(1,("<%d/0x%x> Python: _TARGET_MODULE at %p", getpid(), pthread_self(), _TARGET_MODULE));
+  
   /* cmpi_pywbem_bindings::get_cmpi_proxy_provider */
   PyObject *provclass = PyObject_GetAttrString(_TARGET_MODULE, 
                            "get_cmpi_proxy_provider"); 
@@ -379,10 +381,10 @@
         pthread_mutex_unlock(&_CMPI_INIT_MUTEX);
         return;
     }
-  
+
     TARGET_THREAD_BEGIN_BLOCK;
-    Py_DecRef(_TARGET_MODULE); 
-    TARGET_THREAD_END_BLOCK; 
+    Py_DecRef(_TARGET_MODULE);
+    TARGET_THREAD_END_BLOCK;
   
     PyEval_AcquireLock(); 
     PyThreadState_Swap(cmpiMainPyThreadState); 


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

Revision: 1147
          http://omc.svn.sourceforge.net/omc/?rev=1147&view=rev
Author:   bartw
Date:     2008-11-05 19:45:32 +0000 (Wed, 05 Nov 2008)

Log Message:
-----------
formatting changes

Modified Paths:
--------------
    cmpi-bindings/trunk/README

Modified: cmpi-bindings/trunk/README
===================================================================
--- cmpi-bindings/trunk/README	2008-11-05 18:31:35 UTC (rev 1146)
+++ cmpi-bindings/trunk/README	2008-11-05 19:45:32 UTC (rev 1147)
@@ -1,7 +1,8 @@
 Swig based CMPI bindings
 ------------------------
 
-This implements a CMPI-compliant provider interface for various languages via SWIG.
+This implements a CMPI-compliant provider interface for various languages 
+via SWIG.
 
 Currently supported languages
 
@@ -13,16 +14,19 @@
 
 Implementation
 --------------
-cmpi-bindings is implemented as a single CMPI-compliant provider (per supported language)
-that serves as a "multiplexer" to the instrumented language-specific providers.
+cmpi-bindings is implemented as a single CMPI-compliant provider (per 
+supported language) that serves as a "multiplexer" to the instrumented 
+language-specific providers.
 
-Using a python provider for class Py_Foo as an example, cmpi-bindings project provides a
-cmpi-compliant provider (libpyCmpiProvider.so) that will be registered with the cimom as
-the provider that handles Py_Foo requests.  When libpyCmpiProvider gets the request, it
-will then forward it on to the python module that instruments the Py_Foo class.
+Using a python provider for class Py_Foo as an example, cmpi-bindings 
+project provides a cmpi-compliant provider (libpyCmpiProvider.so) that 
+will be registered with the cimom as the provider that handles Py_Foo 
+requests.  When libpyCmpiProvider gets the request, it will then forward 
+it on to the python module that instruments the Py_Foo class.
 
-cmpi-bindings also provides supported-language-interfaces for the Provider Environment
-and BrokerCIMOMHandle, so that providers can make "up-calls" into the cimom.
+cmpi-bindings also provides supported-language-interfaces for the Provider 
+Environment and BrokerCIMOMHandle, so that providers can make "up-calls" 
+into the cimom.
 
 
 For the stack discussion below, use the following 'type' abbreviations:
@@ -30,7 +34,8 @@
   Python:  py
   Perl:    pl
 
-The cmpi-bindings provider interfaces under CMPI consist of the following stack:
+The cmpi-bindings provider interfaces under CMPI consist of the following 
+stack:
 
 CIMOM
   ->
@@ -46,8 +51,8 @@
 
 Build / Installation
 --------------------
-The build scripts will only build the modules for which you have appropriate devel packages.
-It will skip any others.
+The build scripts will only build the modules for which you have appropriate 
+devel packages.  It will skip any others.
 
   Requirements
   ------------
@@ -58,7 +63,8 @@
 
   Build
   -----
-  From root of tarball's source tree, create a directory 'build' and move (cd) into that directory
+  From root of tarball's source tree, create a directory 'build' and move 
+  (cd) into that directory
   'cmake ..'
   'make'
   'sudo make install'
@@ -66,8 +72,9 @@
   Test
   ----
   For each language, there is a test/<language> directory.
-  Within that directory, there should be test providers, scripts that use the test providers, and
-  scripts to register the mofs and providers with cimoms.
+  Within that directory, there should be test providers, scripts that use 
+  the test providers, and scripts to register the mofs and providers with 
+  cimoms.
 
 
 Language-specific documentation
@@ -80,6 +87,3 @@
 
 
 
-TODO
-----
-See separate TODO file


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

Revision: 1146
          http://omc.svn.sourceforge.net/omc/?rev=1146&view=rev
Author:   npaxton
Date:     2008-11-05 18:31:35 +0000 (Wed, 05 Nov 2008)

Log Message:
-----------
add rc1 to version number

Modified Paths:
--------------
    cmpi-bindings/trunk/VERSION.cmake

Modified: cmpi-bindings/trunk/VERSION.cmake
===================================================================
--- cmpi-bindings/trunk/VERSION.cmake	2008-11-05 18:31:03 UTC (rev 1145)
+++ cmpi-bindings/trunk/VERSION.cmake	2008-11-05 18:31:35 UTC (rev 1146)
@@ -1,3 +1,3 @@
 SET(VERSION_MAJOR "0")
 SET(VERSION_MINOR "4")
-SET(VERSION_PATCH "0")
+SET(VERSION_PATCH "0rc1")


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

Revision: 1145
          http://omc.svn.sourceforge.net/omc/?rev=1145&view=rev
Author:   npaxton
Date:     2008-11-05 18:31:03 +0000 (Wed, 05 Nov 2008)

Log Message:
-----------
Update in prep for 0.4.0rc1 release

Modified Paths:
--------------
    cmpi-bindings/trunk/README
    cmpi-bindings/trunk/TODO

Modified: cmpi-bindings/trunk/README
===================================================================
--- cmpi-bindings/trunk/README	2008-11-04 21:02:34 UTC (rev 1144)
+++ cmpi-bindings/trunk/README	2008-11-05 18:31:03 UTC (rev 1145)
@@ -1,50 +1,85 @@
-Swig bases CMPI bindings
+Swig based CMPI bindings
 ------------------------
 
-This implements a CMPI Instance provider via SWIG. 
+This implements a CMPI-compliant provider interface for various languages via SWIG.
 
-
 Currently supported languages
 
-- Ruby (complete)
-- Python (almost there)
+- Ruby
+- Python
+- Perl (beginning support)
 
-Support for Python is only rough. The Python interpreter and the
-Provider implementation get correctly loaded. But I do not know yet
-how to call a Python function from C.
 
 
-The prototype implements a dummy class 'Cmpi_Swig' which looks like
-this:
+Implementation
+--------------
+cmpi-bindings is implemented as a single CMPI-compliant provider (per supported language)
+that serves as a "multiplexer" to the instrumented language-specific providers.
 
-class Cmpi_Swig : CIM_ManagedElement
-{
-  [Description ("A friendly greeting") ]
-  string hello;
-};
-    
+Using a python provider for class Py_Foo as an example, cmpi-bindings project provides a
+cmpi-compliant provider (libpyCmpiProvider.so) that will be registered with the cimom as
+the provider that handles Py_Foo requests.  When libpyCmpiProvider gets the request, it
+will then forward it on to the python module that instruments the Py_Foo class.
 
-FILES
------
+cmpi-bindings also provides supported-language-interfaces for the Provider Environment
+and BrokerCIMOMHandle, so that providers can make "up-calls" into the cimom.
 
-mof/Swig_Generic.mof
- The class definition
-mof/Swig_Generic.reg
-  The (sfcb based) provider registration data
 
-src/cmpi_instance.c
-  A CMPI instance provider C stub to be included into
-  the SWIG generated C code.
-  It currently implements EnumInstances (for Ruby and Python) and
-  EnumInstanceNames (Ruby only)
-  Supporting more instance methods should be straightforward.
+For the stack discussion below, use the following 'type' abbreviations:
+  Ruby:    rb
+  Python:  py
+  Perl:    pl
 
-include/cmpi
-  cmpi header files
-  
+The cmpi-bindings provider interfaces under CMPI consist of the following stack:
 
+CIMOM
+  ->
+lib<type>CmpiProvider.so
+  ->
+cmpi_<type>wbem_bindings.<type>
+  ->
+<python:  pywbem/cim_provider2.py>
+  ->
+language-specific provider module
 
+
+
+Build / Installation
+--------------------
+The build scripts will only build the modules for which you have appropriate devel packages.
+It will skip any others.
+
+  Requirements
+  ------------
+  cmake
+  python interface requires:  python-devel, pywbem-0.7.0
+  perl interface requires: ?
+  ruby interface requires: ruby-1.8 ruby-devel-1.8
+
+  Build
+  -----
+  From root of tarball's source tree, create a directory 'build' and move (cd) into that directory
+  'cmake ..'
+  'make'
+  'sudo make install'
+
+  Test
+  ----
+  For each language, there is a test/<language> directory.
+  Within that directory, there should be test providers, scripts that use the test providers, and
+  scripts to register the mofs and providers with cimoms.
+
+
+Language-specific documentation
+-------------------------------
+
+  Python
+  -----
+  Visit http://pywbem.wiki.sourceforge.net/Provider+Home for QuickStart Guide,
+  Tutorials, sample providers, etc.
+
+
+
 TODO
 ----
-
-Convert it to a 'Generic' CMPI provider.
\ No newline at end of file
+See separate TODO file

Modified: cmpi-bindings/trunk/TODO
===================================================================
--- cmpi-bindings/trunk/TODO	2008-11-04 21:02:34 UTC (rev 1144)
+++ cmpi-bindings/trunk/TODO	2008-11-05 18:31:03 UTC (rev 1145)
@@ -1,23 +1 @@
-Keep track of which objects are created with new*() methods from the 
-brokerEncFT, and which are created with clone().  We have to release the 
-later, not the former. 
-
-Items marked as "TODO" in the code. 
-
-Finish wrapping broker FTs, such as upcalls. 
-
-Handling CMPIStatus:
-Instead of returning CMPIStatus, check it in C code, and throw and 
-exception if it isn't CMPI_RC_OK.  Functions that return CMPIStatus
-would then be void instead.  We'll check CMPIStatus* output parameters
-as well, and do the same.  We need to create an exception class with a 
-code and error string in swig.  
-[Not possible to pass status+message in a generic way. How about a
-toplevel function which raised the execption ?]
-
-Wrap CMPIEnumeration and CMPIArray in typemaps. 
-
-Indication providers
-
-Update docs on pywbem wiki, starting with quickstart guide. 
-
+* Wrap CMPIEnumeration and CMPIArray in typemaps.


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

Revision: 1144
          http://omc.svn.sourceforge.net/omc/?rev=1144&view=rev
Author:   npaxton
Date:     2008-11-04 21:02:34 +0000 (Tue, 04 Nov 2008)

Log Message:
-----------
updated changes file

Modified Paths:
--------------
    cmpi-bindings/trunk/package/cmpi-bindings.changes

Modified: cmpi-bindings/trunk/package/cmpi-bindings.changes
===================================================================
--- cmpi-bindings/trunk/package/cmpi-bindings.changes	2008-11-04 00:22:20 UTC (rev 1143)
+++ cmpi-bindings/trunk/package/cmpi-bindings.changes	2008-11-04 21:02:34 UTC (rev 1144)
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Thu Oct 23 13:53:28 MDT 2008 - np...@no...
+
+- Update to latest code, prep for release for python bindings
+- Indication support in python
+- Bump version to 0.4.0
+
+-------------------------------------------------------------------
 Thu Oct 16 14:04:32 CEST 2008 - kk...@su...
 
 - Complete Ruby bindings.


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

Revision: 1143
          http://omc.svn.sourceforge.net/omc/?rev=1143&view=rev
Author:   jcarey
Date:     2008-11-04 00:22:20 +0000 (Tue, 04 Nov 2008)

Log Message:
-----------
Changed to log vm-install command line to syslog at vm creation time

Modified Paths:
--------------
    contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-service.c

Modified: contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-service.c
===================================================================
--- contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-service.c	2008-10-30 13:43:55 UTC (rev 1142)
+++ contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-service.c	2008-11-04 00:22:20 UTC (rev 1143)
@@ -934,11 +934,17 @@
 	cmpiutilStrArray_destroy(vm_settings);
 
 	/* Execute vm-install with the constructed command line */
-	DEBUGOUT("Executing:\n");
-	for(i = 0; pstra->strs[i]; i++) {
-		DEBUGOUT("%s ", pstra->strs[i]);
+	if (is_debug()) {
+		cmpiutilStrBuf* cmdBuf = cmpiutilStrBuf_create();
+		cmpiutilStrBuf_set(cmdBuf, "VM Builder Executing: ", 0);
+		for(i = 0; pstra->strs[i]; i++) {
+			cmpiutilStrBuf_cat(cmdBuf, pstra->strs[i], 0);
+			cmpiutilStrBuf_cat(cmdBuf, " ", 0);
+		}
+		DEBUGOUT("%s\n", cmdBuf->bfr);
+		CMLogMessage(_broker, 1, "VMBuilder Provider", cmdBuf->bfr, NULL);
+		cmpiutilStrBuf_destroy(cmdBuf);
 	}
-	DEBUGOUT("\n");
 
 	output = NULL;
 	DEBUGOUT("Calling vm-install...\n");


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