sblim-commit — CVS Commit Info for SBLIM

[Sblim-commit] ecute/Plugin Download jacob_18.zip.url,NONE,1.1

[Benjamin B. <bg...@us...>]

Update of /cvsroot/sblim/ecute/Plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22648/Plugin

Added Files:
	Download jacob_18.zip.url 
Log Message:
jacob link renamed

--- NEW FILE: Download jacob_18.zip.url ---
[InternetShortcut]
URL=http://easynews.dl.sourceforge.net/sourceforge/jacob-project/jacob_18.zip
Modified=60E5D0FE513BC50165

[Sblim-commit] sfcb/regressionTests/DataTypes/schema TST_DataTypes.mof,1.1,NONE TST_DataTypes.reg,1.1,NONE

[Gareth S B. <bes...@us...>]

Update of /cvsroot/sblim/sfcb/regressionTests/DataTypes/schema
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29829/schema

Removed Files:
	TST_DataTypes.mof TST_DataTypes.reg 
Log Message:
removed DataTypes test provider. deprecated by cmpi-tests/cmpi-instancetest provider


--- TST_DataTypes.reg DELETED ---

--- TST_DataTypes.mof DELETED ---

[Sblim-commit] sfcb/regressionTests/DataTypes Makefile,1.1,NONE dataTypes.c,1.1,NONE env,1.1,NONE rules,1.1,NONE

[Gareth S B. <bes...@us...>]

Update of /cvsroot/sblim/sfcb/regressionTests/DataTypes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29829

Removed Files:
	Makefile dataTypes.c env rules 
Log Message:
removed DataTypes test provider. deprecated by cmpi-tests/cmpi-instancetest provider


--- rules DELETED ---

--- Makefile DELETED ---

--- dataTypes.c DELETED ---

--- env DELETED ---

[Sblim-commit] sfcb/regressionTests/DataTypes/tests DeleteInst1.OK,1.1,NONE DeleteInst1.sh,1.1,NONE DeleteInst2.OK,1.1,NONE DeleteInst2.sh,1.1,NONE DeleteInst3.OK,1.1,NONE DeleteInst3.sh,1.1,NONE Enumerate.OK,1.1,NONE Enumerate.sh,1.1,NONE EnumerateNames1.OK,1.1,NONE EnumerateNames1.sh,1.1,NONE EnumerateNames2.OK,1.1,NONE EnumerateNames2.sh,1.1,NONE EnumerateNames3.OK,1.1,NONE EnumerateNames3.sh,1.1,NONE

[Gareth S B. <bes...@us...>]

Update of /cvsroot/sblim/sfcb/regressionTests/DataTypes/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29488

Removed Files:
	DeleteInst1.OK DeleteInst1.sh DeleteInst2.OK DeleteInst2.sh 
	DeleteInst3.OK DeleteInst3.sh Enumerate.OK Enumerate.sh 
	EnumerateNames1.OK EnumerateNames1.sh EnumerateNames2.OK 
	EnumerateNames2.sh EnumerateNames3.OK EnumerateNames3.sh 
Log Message:
removed test files. deprecated by cmpi-tests/cmpi-instancetest tests


--- DeleteInst3.sh DELETED ---

--- EnumerateNames2.OK DELETED ---

--- EnumerateNames1.OK DELETED ---

--- EnumerateNames2.sh DELETED ---

--- Enumerate.sh DELETED ---

--- EnumerateNames3.sh DELETED ---

--- DeleteInst1.OK DELETED ---

--- Enumerate.OK DELETED ---

--- DeleteInst3.OK DELETED ---

--- DeleteInst2.OK DELETED ---

--- DeleteInst1.sh DELETED ---

--- EnumerateNames1.sh DELETED ---

--- EnumerateNames3.OK DELETED ---

--- DeleteInst2.sh DELETED ---

[Sblim-commit] cmpi-tests/cmpi-instancetest/test TST_InstanceDefaults.001.ein.OK,NONE,1.1 TST_InstanceDefaults.001.ein.xml,NONE,1.1 TST_InstanceKeys.001.ein.OK,NONE,1.1 TST_InstanceKeys.001.ein.xml,NONE,1.1 TST_InstanceProperties.001.ein.OK,NONE,1.1 TST_InstanceProperties.001.ein.xml,NONE,1.1 TST_InstanceProperties.002.ein.OK,NONE,1.1 TST_InstanceProperties.002.ein.xml,NONE,1.1 TST_InstanceProperties.003.ein.OK,NONE,1.1 TST_InstanceProperties.003.ein.xml,NONE,1.1 TST_InstanceProperties.004.di.OK,NONE,1.1 TST_InstanceProperties.004.di.xml,NONE,1.1 TST_InstanceProperties.005.di.OK,NONE,1.1 TST_InstanceProperties.005.di.xml,NONE,1.1 TST_InstanceProperties.006.di.OK,NONE,1.1 TST_InstanceProperties.006.di.xml,NONE,1.1 TST_InstanceProperties.007.ein.OK,NONE,1.1 TST_InstanceProperties.007.ein.xml,NONE,1.1 TST_InstanceProperties.CMClassPathIsA.OK,NONE,1.1 TST_InstanceProperties.CMClassPathIsA.xml,NONE,1.1

[Gareth S B. <bes...@us...>]

Update of /cvsroot/sblim/cmpi-tests/cmpi-instancetest/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29264

Added Files:
	TST_InstanceDefaults.001.ein.OK 
	TST_InstanceDefaults.001.ein.xml TST_InstanceKeys.001.ein.OK 
	TST_InstanceKeys.001.ein.xml TST_InstanceProperties.001.ein.OK 
	TST_InstanceProperties.001.ein.xml 
	TST_InstanceProperties.002.ein.OK 
	TST_InstanceProperties.002.ein.xml 
	TST_InstanceProperties.003.ein.OK 
	TST_InstanceProperties.003.ein.xml 
	TST_InstanceProperties.004.di.OK 
	TST_InstanceProperties.004.di.xml 
	TST_InstanceProperties.005.di.OK 
	TST_InstanceProperties.005.di.xml 
	TST_InstanceProperties.006.di.OK 
	TST_InstanceProperties.006.di.xml 
	TST_InstanceProperties.007.ein.OK 
	TST_InstanceProperties.007.ein.xml 
	TST_InstanceProperties.CMClassPathIsA.OK 
	TST_InstanceProperties.CMClassPathIsA.xml 
Log Message:
add CIM XML query tests for instance-test provider, with corresponding correct XML output


--- NEW FILE: TST_InstanceProperties.001.ein.xml ---
<?xml version="1.0"?>
<CIM CIMVERSION="2.0" DTDVERSION="2.0">
<MESSAGE ID="4711" PROTOCOLVERSION="1.0"><SIMPLEREQ><IMETHODCALL NAME="EnumerateInstanceNames"><LOCALNAMESPACEPATH><NAMESPACE NAME="root"/><NAMESPACE NAME="cimv2"/></LOCALNAMESPACEPATH>
<IPARAMVALUE NAME="ClassName"><CLASSNAME NAME="TST_InstanceProperties"/></IPARAMVALUE>
</IMETHODCALL></SIMPLEREQ>
</MESSAGE></CIM>

--- NEW FILE: TST_InstanceKeys.001.ein.OK ---
<?xml version="1.0" encoding="utf-8" ?>
<CIM CIMVERSION="2.0" DTDVERSION="1.1">
<MESSAGE ID="4711" PROTOCOLVERSION="1.0">
<SIMPLERSP>
<IMETHODRESPONSE NAME="EnumerateInstanceNames">
<IRETURNVALUE>
<INSTANCENAME CLASSNAME="TST_InstanceKeys">
<KEYBINDING NAME="CreationClassName">
<KEYVALUE VALUETYPE="string">TST_InstanceKeys</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Id">
<KEYVALUE VALUETYPE="string">Instance #2</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Property_string">
<KEYVALUE VALUETYPE="string">This is instance #2</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Property_uint8">
<KEYVALUE VALUETYPE="numeric">255</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Property_uint16">
<KEYVALUE VALUETYPE="numeric">65535</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Property_uint32">
<KEYVALUE VALUETYPE="numeric">4294836225</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Property_uint64">
<KEYVALUE VALUETYPE="numeric">18445618199572250625</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Property_sint8">
<KEYVALUE VALUETYPE="numeric">-127</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Property_sint16">
<KEYVALUE VALUETYPE="numeric">-32767</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Property_sint32">
<KEYVALUE VALUETYPE="numeric">-1073676289</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Property_sint64">
<KEYVALUE VALUETYPE="numeric">-1152780773560811521</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Property_boolean">
<KEYVALUE VALUETYPE="boolean">TRUE</KEYVALUE>
</KEYBINDING>
</INSTANCENAME>
<INSTANCENAME CLASSNAME="TST_InstanceKeys">
<KEYBINDING NAME="CreationClassName">
<KEYVALUE VALUETYPE="string">TST_InstanceKeys</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Id">
<KEYVALUE VALUETYPE="string">Instance #1</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Property_string">
<KEYVALUE VALUETYPE="string">This is instance #1</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Property_uint8">
<KEYVALUE VALUETYPE="numeric">255</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Property_uint16">
<KEYVALUE VALUETYPE="numeric">65535</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Property_uint32">
<KEYVALUE VALUETYPE="numeric">4294836225</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Property_uint64">
<KEYVALUE VALUETYPE="numeric">18445618199572250625</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Property_sint8">
<KEYVALUE VALUETYPE="numeric">-127</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Property_sint16">
<KEYVALUE VALUETYPE="numeric">-32767</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Property_sint32">
<KEYVALUE VALUETYPE="numeric">-1073676289</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Property_sint64">
<KEYVALUE VALUETYPE="numeric">-1152780773560811521</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Property_boolean">
<KEYVALUE VALUETYPE="boolean">TRUE</KEYVALUE>
</KEYBINDING>
</INSTANCENAME>
</IRETURNVALUE>
</IMETHODRESPONSE>
</SIMPLERSP>
</MESSAGE>
</CIM>

--- NEW FILE: TST_InstanceProperties.006.di.xml ---
<?xml version="1.0" encoding="utf-8" ?>
<CIM CIMVERSION="2.0" DTDVERSION="2.0">
<MESSAGE ID="4711" PROTOCOLVERSION="1.0"><SIMPLEREQ><IMETHODCALL NAME="DeleteInstance"><LOCALNAMESPACEPATH><NAMESPACE NAME="root"></NAMESPACE><NAMESPACE NAME="cimv2"></NAMESPACE></LOCALNAMESPACEPATH>
<IPARAMVALUE NAME="InstanceName"><INSTANCENAME CLASSNAME="TST_InstanceProperties"><KEYBINDING NAME="CreationClassName"><KEYVALUE VALUETYPE="string">TST_InstanceProperties</KEYVALUE></KEYBINDING><KEYBINDING NAME="Id"><KEYVALUE VALUETYPE="string">Instance #2</KEYVALUE></KEYBINDING></INSTANCENAME></IPARAMVALUE>
</IMETHODCALL></SIMPLEREQ>
</MESSAGE></CIM>

--- NEW FILE: TST_InstanceProperties.004.di.xml ---
<?xml version="1.0" encoding="utf-8" ?>
<CIM CIMVERSION="2.0" DTDVERSION="2.0">
<MESSAGE ID="4711" PROTOCOLVERSION="1.0"><SIMPLEREQ><IMETHODCALL NAME="DeleteInstance"><LOCALNAMESPACEPATH><NAMESPACE NAME="root"></NAMESPACE><NAMESPACE NAME="cimv2"></NAMESPACE></LOCALNAMESPACEPATH>
<IPARAMVALUE NAME="InstanceName"><INSTANCENAME CLASSNAME="TST_InstanceProperties"><KEYBINDING NAME="CreationClassName"><KEYVALUE VALUETYPE="string">TST_InstanceProperties</KEYVALUE></KEYBINDING><KEYBINDING NAME="Id"><KEYVALUE VALUETYPE="string">Instance #1</KEYVALUE></KEYBINDING></INSTANCENAME></IPARAMVALUE>
</IMETHODCALL></SIMPLEREQ>
</MESSAGE></CIM>

--- NEW FILE: TST_InstanceProperties.004.di.OK ---
<?xml version="1.0" encoding="utf-8" ?>
<CIM CIMVERSION="2.0" DTDVERSION="1.1">
<MESSAGE ID="4711" PROTOCOLVERSION="1.0">
<SIMPLERSP>
<IMETHODRESPONSE NAME="DeleteInstance">
<IRETURNVALUE>
</IRETURNVALUE>
</IMETHODRESPONSE>
</SIMPLERSP>
</MESSAGE>

--- NEW FILE: TST_InstanceProperties.003.ein.xml ---
<?xml version="1.0"?>
<CIM CIMVERSION="2.0" DTDVERSION="2.0">
<MESSAGE ID="4711" PROTOCOLVERSION="1.0"><SIMPLEREQ><IMETHODCALL NAME="EnumerateInstanceNames"><LOCALNAMESPACEPATH><NAMESPACE NAME="root"/><NAMESPACE NAME="cimv2"/></LOCALNAMESPACEPATH>
<IPARAMVALUE NAME="ClassName"><CLASSNAME NAME="TST_BadInstanceProperties"/></IPARAMVALUE>
</IMETHODCALL></SIMPLEREQ>
</MESSAGE></CIM>

--- NEW FILE: TST_InstanceProperties.002.ein.xml ---
<?xml version="1.0"?>
<CIM CIMVERSION="2.0" DTDVERSION="2.0">
<MESSAGE ID="4711" PROTOCOLVERSION="1.0"><SIMPLEREQ><IMETHODCALL NAME="EnumerateInstanceNames"><LOCALNAMESPACEPATH><NAMESPACE NAME="root"/><NAMESPACE NAME="cimv22"/></LOCALNAMESPACEPATH>
<IPARAMVALUE NAME="ClassName"><CLASSNAME NAME="TST_InstanceProperties"/></IPARAMVALUE>
</IMETHODCALL></SIMPLEREQ>
</MESSAGE></CIM>

--- NEW FILE: TST_InstanceProperties.CMClassPathIsA.OK ---
<?xml version="1.0" encoding="utf-8" ?>
<CIM CIMVERSION="2.0" DTDVERSION="1.1">
<MESSAGE ID="4711" PROTOCOLVERSION="1.0">
<SIMPLERSP>
<METHODRESPONSE NAME="CMClassPathIsA">
<RETURNVALUE>
<VALUE>TRUE</VALUE>
</RETURNVALUE>
</METHODRESPONSE>
</SIMPLERSP>
</MESSAGE>
</CIM>

--- NEW FILE: TST_InstanceProperties.005.di.xml ---
<?xml version="1.0" encoding="utf-8" ?>
<CIM CIMVERSION="2.0" DTDVERSION="2.0">
<MESSAGE ID="4711" PROTOCOLVERSION="1.0"><SIMPLEREQ><IMETHODCALL NAME="DeleteInstance"><LOCALNAMESPACEPATH><NAMESPACE NAME="root"></NAMESPACE><NAMESPACE NAME="cimv2"></NAMESPACE></LOCALNAMESPACEPATH>
<IPARAMVALUE NAME="InstanceName"><INSTANCENAME CLASSNAME="TST_InstanceProperties"><KEYBINDING NAME="CreationClassName"><KEYVALUE VALUETYPE="string">TST_InstanceProperties</KEYVALUE></KEYBINDING><KEYBINDING NAME="Id"><KEYVALUE VALUETYPE="string">Instance #2</KEYVALUE></KEYBINDING></INSTANCENAME></IPARAMVALUE>
</IMETHODCALL></SIMPLEREQ>
</MESSAGE></CIM>

--- NEW FILE: TST_InstanceProperties.002.ein.OK ---
<?xml version="1.0" encoding="utf-8" ?>
<CIM CIMVERSION="2.0" DTDVERSION="1.1">
<MESSAGE ID="4711" PROTOCOLVERSION="1.0">
<SIMPLERSP>
<IMETHODRESPONSE NAME="EnumerateInstanceNames">
<ERROR CODE="5" DESCRIPTION="Invalid namespace"/>
</IMETHODRESPONSE>
</SIMPLERSP>
</MESSAGE>
</CIM>

--- NEW FILE: TST_InstanceProperties.007.ein.OK ---
<?xml version="1.0" encoding="utf-8" ?>
<CIM CIMVERSION="2.0" DTDVERSION="1.1">
<MESSAGE ID="4711" PROTOCOLVERSION="1.0">
<SIMPLERSP>
<IMETHODRESPONSE NAME="EnumerateInstanceNames">
<IRETURNVALUE>
</IRETURNVALUE>
</IMETHODRESPONSE>
</SIMPLERSP>
</MESSAGE>
</CIM>

--- NEW FILE: TST_InstanceProperties.003.ein.OK ---
<?xml version="1.0" encoding="utf-8" ?>
<CIM CIMVERSION="2.0" DTDVERSION="1.1">
<MESSAGE ID="4711" PROTOCOLVERSION="1.0">
<SIMPLERSP>
<IMETHODRESPONSE NAME="EnumerateInstanceNames">
<ERROR CODE="5" DESCRIPTION="Class not found"/>
</IMETHODRESPONSE>
</SIMPLERSP>
</MESSAGE>
</CIM>

--- NEW FILE: TST_InstanceProperties.007.ein.xml ---
<?xml version="1.0"?>
<CIM CIMVERSION="2.0" DTDVERSION="2.0">
<MESSAGE ID="4711" PROTOCOLVERSION="1.0"><SIMPLEREQ><IMETHODCALL NAME="EnumerateInstanceNames"><LOCALNAMESPACEPATH><NAMESPACE NAME="root"/><NAMESPACE NAME="cimv2"/></LOCALNAMESPACEPATH>
<IPARAMVALUE NAME="ClassName"><CLASSNAME NAME="TST_InstanceProperties"/></IPARAMVALUE>
</IMETHODCALL></SIMPLEREQ>
</MESSAGE></CIM>

--- NEW FILE: TST_InstanceProperties.005.di.OK ---
<?xml version="1.0" encoding="utf-8" ?>
<CIM CIMVERSION="2.0" DTDVERSION="1.1">
<MESSAGE ID="4711" PROTOCOLVERSION="1.0">
<SIMPLERSP>
<IMETHODRESPONSE NAME="DeleteInstance">
<IRETURNVALUE>
</IRETURNVALUE>
</IMETHODRESPONSE>
</SIMPLERSP>
</MESSAGE>

--- NEW FILE: TST_InstanceProperties.001.ein.OK ---
<?xml version="1.0" encoding="utf-8" ?>
<CIM CIMVERSION="2.0" DTDVERSION="1.1">
<MESSAGE ID="4711" PROTOCOLVERSION="1.0">
<SIMPLERSP>
<IMETHODRESPONSE NAME="EnumerateInstanceNames">
<IRETURNVALUE>
<INSTANCENAME CLASSNAME="TST_InstanceProperties">
<KEYBINDING NAME="CreationClassName">
<KEYVALUE VALUETYPE="string">TST_InstanceProperties</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Id">
<KEYVALUE VALUETYPE="string">Instance #2</KEYVALUE>
</KEYBINDING>
</INSTANCENAME>
<INSTANCENAME CLASSNAME="TST_InstanceProperties">
<KEYBINDING NAME="CreationClassName">
<KEYVALUE VALUETYPE="string">TST_InstanceProperties</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Id">
<KEYVALUE VALUETYPE="string">Instance #1</KEYVALUE>
</KEYBINDING>
</INSTANCENAME>
</IRETURNVALUE>
</IMETHODRESPONSE>
</SIMPLERSP>
</MESSAGE>
</CIM>

--- NEW FILE: TST_InstanceDefaults.001.ein.OK ---
<?xml version="1.0" encoding="utf-8" ?>
<CIM CIMVERSION="2.0" DTDVERSION="1.1">
<MESSAGE ID="4711" PROTOCOLVERSION="1.0">
<SIMPLERSP>
<IMETHODRESPONSE NAME="EnumerateInstanceNames">
<IRETURNVALUE>
<INSTANCENAME CLASSNAME="TST_InstanceDefaults">
<KEYBINDING NAME="CreationClassName">
<KEYVALUE VALUETYPE="string">TST_InstanceDefaults</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Id">
<KEYVALUE VALUETYPE="string">Instance #2</KEYVALUE>
</KEYBINDING>
</INSTANCENAME>
<INSTANCENAME CLASSNAME="TST_InstanceDefaults">
<KEYBINDING NAME="CreationClassName">
<KEYVALUE VALUETYPE="string">TST_InstanceDefaults</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Id">
<KEYVALUE VALUETYPE="string">Instance #1</KEYVALUE>
</KEYBINDING>
</INSTANCENAME>
</IRETURNVALUE>
</IMETHODRESPONSE>
</SIMPLERSP>
</MESSAGE>

--- NEW FILE: TST_InstanceProperties.006.di.OK ---
<?xml version="1.0" encoding="utf-8" ?>
<CIM CIMVERSION="2.0" DTDVERSION="1.1">
<MESSAGE ID="4711" PROTOCOLVERSION="1.0">
<SIMPLERSP>
<IMETHODRESPONSE NAME="DeleteInstance">
<ERROR CODE="6" DESCRIPTION="Requested instance not found"/>
</IMETHODRESPONSE>
</SIMPLERSP>
</MESSAGE>
</CIM>

--- NEW FILE: TST_InstanceDefaults.001.ein.xml ---
<?xml version="1.0" encoding="utf-8" ?>
<CIM CIMVERSION="2.0" DTDVERSION="2.0">
<MESSAGE ID="4711" PROTOCOLVERSION="1.0"><SIMPLEREQ><IMETHODCALL NAME="EnumerateInstanceNames"><LOCALNAMESPACEPATH><NAMESPACE NAME="root"></NAMESPACE><NAMESPACE NAME="cimv2"></NAMESPACE></LOCALNAMESPACEPATH>
<IPARAMVALUE NAME="ClassName"><CLASSNAME NAME="TST_InstanceDefaults"/></IPARAMVALUE>
</IMETHODCALL></SIMPLEREQ>
</MESSAGE></CIM>

--- NEW FILE: TST_InstanceProperties.CMClassPathIsA.xml ---
<?xml version="1.0" encoding="utf-8"?>
<CIM CIMVERSION="2.0" DTDVERSION="2.0">
  <MESSAGE ID="4711" PROTOCOLVERSION="1.0">
    <SIMPLEREQ>
      <METHODCALL NAME="CMClassPathIsA">
        <LOCALINSTANCEPATH>
          <LOCALNAMESPACEPATH>
            <NAMESPACE NAME="root"/>
            <NAMESPACE NAME="cimv2"/>
          </LOCALNAMESPACEPATH>
          <INSTANCENAME CLASSNAME="TST_InstanceProperties">
            <KEYBINDING NAME="CreationClassName">
              <KEYVALUE VALUETYPE="string">TST_InstanceProperties</KEYVALUE>
            </KEYBINDING>
            <KEYBINDING NAME="Id">
              <KEYVALUE VALUETYPE="string">Instance #1</KEYVALUE>
            </KEYBINDING>
          </INSTANCENAME>
        </LOCALINSTANCEPATH>
        <PARAMVALUE NAME="type" PARAMTYPE="string">
          <VALUE>CIM_ManagedElement</VALUE>
        </PARAMVALUE>
      </METHODCALL>
    </SIMPLEREQ>
  </MESSAGE>
</CIM>

--- NEW FILE: TST_InstanceKeys.001.ein.xml ---
<?xml version="1.0" encoding="utf-8"?>
<CIM CIMVERSION="2.0" DTDVERSION="2.0">
<MESSAGE ID="4711" PROTOCOLVERSION="1.0"><SIMPLEREQ><IMETHODCALL NAME="EnumerateInstanceNames"><LOCALNAMESPACEPATH><NAMESPACE NAME="root"/><NAMESPACE NAME="cimv2"/></LOCALNAMESPACEPATH>
<IPARAMVALUE NAME="ClassName"><CLASSNAME NAME="TST_InstanceKeys"/></IPARAMVALUE>
</IMETHODCALL></SIMPLEREQ>
</MESSAGE></CIM>

[Sblim-commit] sfcb/regressionTests/FilesAndDirectories/tests AssociationDirNames1.diff,1.1,NONE AssociatorDirNames1.OK,1.1,NONE AssociatorDirNames1.sh,1.1,NONE DeleteDirInstance1.OK,1.1,NONE DeleteDirInstance1.sh,1.1,NONE EnumerateDir1.OK,1.1,NONE EnumerateDir1.sh,1.1,NONE EnumerateDirNames1.OK,1.1,NONE EnumerateDirNames1.sh,1.1,NONE GetDirInstance1.diff,1.1,NONE GetInstance1.OK,1.1,NONE GetInstance1.sh,1.1,NONE PlainFileMethod.sh,1.1,NONE PlainFileMethod1.OK,1.1,NONE ReferenceDirNames1.OK,1.1,NONE ReferenceDirNames1.sh,1.1,NONE tmp,1.1,NONE

[Gareth S B. <bes...@us...>]

Update of /cvsroot/sblim/sfcb/regressionTests/FilesAndDirectories/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24927/tests

Removed Files:
	AssociationDirNames1.diff AssociatorDirNames1.OK 
	AssociatorDirNames1.sh DeleteDirInstance1.OK 
	DeleteDirInstance1.sh EnumerateDir1.OK EnumerateDir1.sh 
	EnumerateDirNames1.OK EnumerateDirNames1.sh 
	GetDirInstance1.diff GetInstance1.OK GetInstance1.sh 
	PlainFileMethod.sh PlainFileMethod1.OK ReferenceDirNames1.OK 
	ReferenceDirNames1.sh tmp 
Log Message:
removed tests files. will be deprecated by cmpi-samples/cmpi-fad sblim testsuite 
automated tests


--- tmp DELETED ---

--- GetDirInstance1.diff DELETED ---

--- ReferenceDirNames1.OK DELETED ---

--- EnumerateDirNames1.OK DELETED ---

--- EnumerateDir1.OK DELETED ---

--- ReferenceDirNames1.sh DELETED ---

--- AssociatorDirNames1.OK DELETED ---

--- GetInstance1.sh DELETED ---

--- AssociationDirNames1.diff DELETED ---

--- PlainFileMethod1.OK DELETED ---

--- DeleteDirInstance1.sh DELETED ---

--- EnumerateDir1.sh DELETED ---

--- EnumerateDirNames1.sh DELETED ---

--- AssociatorDirNames1.sh DELETED ---

--- PlainFileMethod.sh DELETED ---

--- DeleteDirInstance1.OK DELETED ---

--- GetInstance1.OK DELETED ---

[Sblim-commit] sfcb/regressionTests/FilesAndDirectories/schema CWS_FilesAndDirs.mof,1.1,NONE CWS_FilesAndDirs.reg,1.1,NONE

[Gareth S B. <bes...@us...>]

Update of /cvsroot/sblim/sfcb/regressionTests/FilesAndDirectories/schema
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24327/schema

Removed Files:
	CWS_FilesAndDirs.mof CWS_FilesAndDirs.reg 
Log Message:
removed files and directory test provider b/c deprecated by cmpi-samples/cmpi-fad provider
note - still need to add automated sblim testsuite tests to cmpi-fad 


--- CWS_FilesAndDirs.mof DELETED ---

--- CWS_FilesAndDirs.reg DELETED ---

[Sblim-commit] sfcb/regressionTests/FilesAndDirectories CWS_Directory.c,1.1,NONE CWS_DirectoryContainsFile.c,1.1,NONE CWS_FileUtils.c,1.1,NONE CWS_FileUtils.h,1.1,NONE CWS_PlainFile.c,1.1,NONE cwssimdata.c,1.1,NONE cwstest.c,1.1,NONE cwsutil.c,1.1,NONE cwsutil.h,1.1,NONE env,1.1,NONE makefile,1.1,NONE rules,1.1,NONE

[Gareth S B. <bes...@us...>]

Update of /cvsroot/sblim/sfcb/regressionTests/FilesAndDirectories
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24327

Removed Files:
	CWS_Directory.c CWS_DirectoryContainsFile.c CWS_FileUtils.c 
	CWS_FileUtils.h CWS_PlainFile.c cwssimdata.c cwstest.c 
	cwsutil.c cwsutil.h env makefile rules 
Log Message:
removed files and directory test provider b/c deprecated by cmpi-samples/cmpi-fad provider
note - still need to add automated sblim testsuite tests to cmpi-fad 


--- cwssimdata.c DELETED ---

--- rules DELETED ---

--- CWS_PlainFile.c DELETED ---

--- CWS_DirectoryContainsFile.c DELETED ---

--- CWS_Directory.c DELETED ---

--- makefile DELETED ---

--- cwsutil.h DELETED ---

--- cwsutil.c DELETED ---

--- env DELETED ---

--- CWS_FileUtils.c DELETED ---

--- cwstest.c DELETED ---

--- CWS_FileUtils.h DELETED ---

[Sblim-commit] sfcb/regressionTests/BigOutput/tests BigInstEnumeration.OK,1.1,NONE BigInstEnumeration.sh,1.1,NONE

[Gareth S B. <bes...@us...>]

Update of /cvsroot/sblim/sfcb/regressionTests/BigOutput/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23341/tests

Removed Files:
	BigInstEnumeration.OK BigInstEnumeration.sh 
Log Message:
remove BigOutput tests. Deprecated by cmpi-tests/cmpi-reef test provider


--- BigInstEnumeration.OK DELETED ---

--- BigInstEnumeration.sh DELETED ---

[Sblim-commit] sfcb/regressionTests/BigOutput Makefile,1.1,NONE cmpiReefProvider.c,1.1,NONE cmpiReefProvider.h,1.1,NONE env,1.1,NONE rules,1.1,NONE

[Gareth S B. <bes...@us...>]

Update of /cvsroot/sblim/sfcb/regressionTests/BigOutput
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23341

Removed Files:
	Makefile cmpiReefProvider.c cmpiReefProvider.h env rules 
Log Message:
remove BigOutput tests. Deprecated by cmpi-tests/cmpi-reef test provider


--- rules DELETED ---

--- Makefile DELETED ---

--- cmpiReefProvider.h DELETED ---

--- env DELETED ---

--- cmpiReefProvider.c DELETED ---

[Sblim-commit] sfcb/regressionTests/BigOutput/schema bigOutput.mof,1.1,NONE bigOutput.reg,1.1,NONE

[Gareth S B. <bes...@us...>]

Update of /cvsroot/sblim/sfcb/regressionTests/BigOutput/schema
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23341/schema

Removed Files:
	bigOutput.mof bigOutput.reg 
Log Message:
remove BigOutput tests. Deprecated by cmpi-tests/cmpi-reef test provider


--- bigOutput.reg DELETED ---

--- bigOutput.mof DELETED ---

[Sblim-commit] cmpi-tests/cmpi-reef/test Reef_LogicalVolume.ei.OK,NONE,1.1 Reef_LogicalVolume.ei.xml,NONE,1.1

[Gareth S B. <bes...@us...>]

Update of /cvsroot/sblim/cmpi-tests/cmpi-reef/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5247

Added Files:
	Reef_LogicalVolume.ei.OK Reef_LogicalVolume.ei.xml 
Log Message:
added enumerateinstances xml request and correct xml respose file


--- NEW FILE: Reef_LogicalVolume.ei.OK ---
<?xml version="1.0" encoding="utf-8" ?>
<CIM CIMVERSION="2.0" DTDVERSION="1.1">
<MESSAGE ID="4711" PROTOCOLVERSION="1.0">
<SIMPLERSP>
<IMETHODRESPONSE NAME="EnumerateInstances">
<IRETURNVALUE>
<VALUE.NAMEDINSTANCE>
<INSTANCENAME CLASSNAME="Reef_LogicalVolume">
<KEYBINDING NAME="key">
<KEYVALUE VALUETYPE="numeric">1</KEYVALUE>
</KEYBINDING>
</INSTANCENAME>
<INSTANCE CLASSNAME="Reef_LogicalVolume">
<PROPERTY NAME="storageFacilityImageMTMS" TYPE="string">
<VALUE>storFacilImageM</VALUE>
</PROPERTY>
<PROPERTY NAME="volumeType" TYPE="uint32">
<VALUE>5</VALUE>
</PROPERTY>
[...320777 lines suppressed...]
</PROPERTY>
<PROPERTY NAME="configurationState" TYPE="uint32">
<VALUE>16004</VALUE>
</PROPERTY>
<PROPERTY NAME="creationDate" TYPE="uint32">
<VALUE>0</VALUE>
</PROPERTY>
<PROPERTY NAME="codeLevel" TYPE="string">
<VALUE>aaabbbccc</VALUE>
</PROPERTY>
<PROPERTY NAME="key" TYPE="sint32">
<VALUE>4000</VALUE>
</PROPERTY>
</INSTANCE>
</VALUE.NAMEDINSTANCE>
</IRETURNVALUE>
</IMETHODRESPONSE>
</SIMPLERSP>
</MESSAGE>
</CIM>

--- NEW FILE: Reef_LogicalVolume.ei.xml ---
<?xml version="1.0" encoding="utf-8"?>
<CIM CIMVERSION="2.0" DTDVERSION="2.0">
<MESSAGE ID="4711" PROTOCOLVERSION="1.0"><SIMPLEREQ><IMETHODCALL NAME="EnumerateInstances"><LOCALNAMESPACEPATH><NAMESPACE NAME="root"/><NAMESPACE NAME="cimv2"/></LOCALNAMESPACEPATH>
<IPARAMVALUE NAME="ClassName"><CLASSNAME NAME="Reef_LogicalVolume"/></IPARAMVALUE>
<IPARAMVALUE NAME="DeepInheritance"><VALUE>TRUE</VALUE></IPARAMVALUE>
<IPARAMVALUE NAME="LocalOnly"><VALUE>FALSE</VALUE></IPARAMVALUE>
<IPARAMVALUE NAME="IncludeQualifiers"><VALUE>FALSE</VALUE></IPARAMVALUE>
<IPARAMVALUE NAME="IncludeClassOrigin"><VALUE>TRUE</VALUE></IPARAMVALUE>
</IMETHODCALL></SIMPLEREQ>
</MESSAGE></CIM>

[Sblim-commit] cmpi-tests/cmpi-instancetest Makefile.am,1.1.1.1,1.2

[Gareth S B. <bes...@us...>]

Update of /cvsroot/sblim/cmpi-tests/cmpi-instancetest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31605

Modified Files:
	Makefile.am 
Log Message:
added support for additional instance classes


Index: Makefile.am
===================================================================
RCS file: /cvsroot/sblim/cmpi-tests/cmpi-instancetest/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Makefile.am	4 May 2005 23:12:04 -0000	1.1.1.1
+++ Makefile.am	12 May 2005 00:54:05 -0000	1.2
@@ -69,7 +69,7 @@
 # -----------------------------------------------------------------------------
 
 # LIST ALL THE CLASS DEFINITION FILES (MOFS) HERE
-MOFS=schema/TST_InstanceProperties.mof
+MOFS=schema/TST_InstanceProperties.mof schema/TST_InstanceKeys.mof schema/TST_InstanceDefaults.mof
 
 # LIST ALL THE CLASS CIMOM REGISTRATION FILES HERE
 REGS=schema/TST_InstanceTest.registration

[Sblim-commit] cmpi-tests/cmpi-instancetest/src TST_InstanceTest.c,1.1.1.1,1.2 cmpiutil.c,1.1.1.1,1.2

[Gareth S B. <bes...@us...>]

Update of /cvsroot/sblim/cmpi-tests/cmpi-instancetest/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31456

Modified Files:
	TST_InstanceTest.c cmpiutil.c 
Log Message:
changes to support multiple classes in internal instance repository


Index: TST_InstanceTest.c
===================================================================
RCS file: /cvsroot/sblim/cmpi-tests/cmpi-instancetest/src/TST_InstanceTest.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- TST_InstanceTest.c	7 May 2005 00:45:42 -0000	1.1.1.1
+++ TST_InstanceTest.c	12 May 2005 00:53:19 -0000	1.2
@@ -11,7 +11,7 @@
 //
 // Author:       Dr. Gareth S. Bestor, <bes...@us...>
 // Contributors:
-// Last Updated: May 3, 2005
+// Last Updated: May 11, 2005
 // Description:
 // =============================================================================
 
@@ -20,13 +20,16 @@
 #include "cmpift.h"
 #include "cmpimacs.h"
 
-/* Classname for creating internal instances */
-static char _CLASSNAME[] = "TST_InstanceProperties";
+/* NULL terminated list of classnames supported by this provider */
+static char * _CLASSNAMES[] = {"TST_InstanceProperties", "TST_InstanceKeys", "TST_InstanceDefaults", NULL};
 
 /* Namespace for creating internal instances */
 static char _NAMESPACE[] = "root/cimv2";
 
-/* NULL terminated list of key property names for this class */
+/* NULL terminated list of property names for the class(es) */
+static char * _PROPERTYNAMES[] = {"CreationClassName", "Id", "Property_string", "Property_uint8", "Property_uint16", "Property_uint32", "Property_uint64", "Property_sint8", "Property_sint16", "Property_sint32", "Property_sint64", "Property_boolean", "Property_real32", "Property_real64", "Property_dateTime", "Property_char16", NULL};
+
+/* NULL terminated list of key names for the class(es) */
 static char * _KEYNAMES[] = {"CreationClassName", "Id", NULL};
 
 /* Include useful utility functions */
@@ -134,7 +137,8 @@
    CMPIStatus status = {CMPI_RC_OK, NULL};      /* Return status of CIM operations */
    CMPIString * classname;
    char * classnamestring;
-
+   char * classnameptr = _CLASSNAMES[0];
+ 
    _OSBASE_TRACE(1,("%s:_testclassname() called", _PROVIDERNAME));
 
    /* Check that we have an object path to test */
@@ -168,10 +172,11 @@
       goto exit;
    }
 
-   /* Check that the namespace has the correct value */
-   if (strcmp(classnamestring, _CLASSNAME) != 0) {
-      _OSBASE_TRACE(1,("%s:_testclassname() incorrect classname - \"%s\"", _PROVIDERNAME, classnamestring));
-      CMSetStatusWithChars(_BROKER, &status, CMPI_RC_ERR_FAILED, "incorrect classname,");
+   /* Check that the classname is recognized */
+   while ((classnameptr != NULL) && (strcmp(classnamestring, classnameptr) != 0)) classnameptr++;
+   if (classnameptr == NULL) {
+      _OSBASE_TRACE(1,("%s:_testclassname() unrecognized classname - \"%s\"", _PROVIDERNAME, classnamestring));
+      CMSetStatusWithChars(_BROKER, &status, CMPI_RC_ERR_FAILED, "unrecognized classname,");
       goto exit;
    }
 
@@ -189,6 +194,7 @@
 {
    CMPIStatus status = {CMPI_RC_OK, NULL};      /* Return status of CIM operations */
    char * namestring = NULL;
+   char * propertynameptr = _PROPERTYNAMES[0];
 
    _OSBASE_TRACE(1,("%s:_testpropertyname() called", _PROVIDERNAME));
 
@@ -208,10 +214,9 @@
       goto exit;
    }
 
-   /* Check that the propety name is recognized */
-   if ((strcmp(namestring, "CreationClassName") != 0) &&
-       (strcmp(namestring, "Id") != 0) && 
-       (strncmp(namestring, "Property_", strlen("Property_")) != 0)) {
+   /* Check that the property name is recognized */
+   while ((propertynameptr != NULL) && (strcmp(namestring, propertynameptr) != 0)) propertynameptr++;
+   if (propertynameptr == NULL) {
       _OSBASE_TRACE(1,("%s:_testpropertyname() unrecognized property - \"%s\"", _PROVIDERNAME, namestring));
       CMSetStatusWithChars(_BROKER, &status, CMPI_RC_ERR_FAILED, "unrecognized property");
       goto exit;
@@ -326,9 +331,9 @@
    }
 
    /* Check for 'good' property value state */
-   if (!(data.state & CMPI_goodValue)) {
+   if (data.state != CMPI_goodValue) {
       _OSBASE_TRACE(1,("%s:_testpropertystate() property value state is not 'good'", _PROVIDERNAME));
-//      CMSetStatusWithChars(_BROKER, &status, CMPI_RC_ERR_FAILED, "property value is not 'good'");
+      CMSetStatusWithChars(_BROKER, &status, CMPI_RC_ERR_FAILED, "property value is not 'good'");
       goto exit;
    }
 
@@ -407,7 +412,7 @@
    else if (strcmp(namestring, "Property_uint64") == 0) {
       _OSBASE_TRACE(2,("%s:_testpropertyvalue() property value=%u, data value=%u", _PROVIDERNAME,
 		value.uint64, instancedata->Property_uint64));
-//      if (value.uint64 != instancedata->Property_uint64) goto error;
+      if (value.uint64 != instancedata->Property_uint64) goto error;
    }
 
    else if (strcmp(namestring, "Property_sint8") == 0) {
@@ -431,7 +436,7 @@
    else if (strcmp(namestring, "Property_sint64") == 0) {
       _OSBASE_TRACE(2,("%s:_testpropertyvalue() property value=%d, data value=%d", _PROVIDERNAME,
 		value.sint64, instancedata->Property_sint64));
-//      if (value.sint64 != instancedata->Property_sint64) goto error;
+      if (value.sint64 != instancedata->Property_sint64) goto error;
    }
 
    else if (strcmp(namestring, "Property_boolean") == 0) {
@@ -507,7 +512,7 @@
       CMSetStatusWithChars(_BROKER, &status, CMPI_RC_ERR_FAILED, "unrecognized property");
       goto exit;
 
-error:
+error: /* Note - regular code path can never reach here except via an explicit goto error. */
       _OSBASE_TRACE(1,("%s:_testpropertyvalue() incorrect property value", _PROVIDERNAME));
       CMSetStatusWithChars(_BROKER, &status, CMPI_RC_ERR_FAILED, "incorrect property value");
       goto exit;
@@ -528,7 +533,8 @@
    CMPIStatus status = {CMPI_RC_OK, NULL};      /* Return status of CIM operations */
    int numproperties, i;
    CMPIString * name;
-   CMPIData data;
+   CMPIData data, data2;
+   char * namestring;
 
    _OSBASE_TRACE(1,("%s:_testproperties() called", _PROVIDERNAME));
 
@@ -559,6 +565,7 @@
       /* Check the property name */
       status = _testpropertyname(name);
       if (status.rc != CMPI_RC_OK) goto exit;
+      namestring = CMGetCharPtr(name);
 
       /* Check that the property value state is correct */
       status = _testpropertystate(data);
@@ -572,8 +579,30 @@
       status = _testpropertyvalue(name, data, instancedata);
       if (status.rc != CMPI_RC_OK) goto exit;
 
+      /* Check that CMGetProperty() also works and returns the same data */
+      data2 = CMGetProperty(instance, namestring, &status);
+      if (status.rc != CMPI_RC_OK) {
+         _OSBASE_TRACE(1,("%s:_testproperties() CMGetProperty(%s) failed", _PROVIDERNAME, namestring));
+         CMSetStatusWithChars(_BROKER, &status, CMPI_RC_ERROR_SYSTEM, "CMGetProperty() failed");
+         goto exit;
+      }
+
+      /* Check that the CMGetProperty() value state is the same */
+      if (data2.state != data.state) {
+         _OSBASE_TRACE(1,("%s:_testproperties() CMGetProperty(%s) has different state", _PROVIDERNAME, namestring));
+         CMSetStatusWithChars(_BROKER, &status, CMPI_RC_ERROR_SYSTEM, "CMGetProperty() has different state");
+         goto exit;
+      }
+
+      /* Check that the CMGetProperty() value is the same */
+      if (!_CMSameValue(data, data2)) {
+         _OSBASE_TRACE(1,("%s:_testproperties() CMGetProperty(%s) has different value", _PROVIDERNAME, namestring));
+         CMSetStatusWithChars(_BROKER, &status, CMPI_RC_ERROR_SYSTEM, "CMGetProperty() has different value");
+         goto exit;
+      }
+ 
       /* If got here then the property is OK */
-      _OSBASE_TRACE(1,("%s:_testproperties() property #%d is OK", _PROVIDERNAME, i));
+      _OSBASE_TRACE(1,("%s:_testproperties() property #%d \"%s\" is OK", _PROVIDERNAME, i, namestring));
    }
 
    /* Finished */
@@ -621,7 +650,8 @@
    CMPIStatus status = {CMPI_RC_OK, NULL};      /* Return status of CIM operations */
    int numkeys, i;
    CMPIString * name;
-   CMPIData data;
+   CMPIData data, data2;
+   char * namestring;
 
    _OSBASE_TRACE(1,("%s:_testkeys() called", _PROVIDERNAME));
 
@@ -652,6 +682,7 @@
       /* Check the property name */
       status = _testpropertyname(name);
       if (status.rc != CMPI_RC_OK) goto exit;
+      namestring = CMGetCharPtr(name);
       
       /* Check that the property value state is correct */
       status = _testpropertystate(data);
@@ -665,8 +696,30 @@
       status = _testpropertyvalue(name, data, instancedata);
       if (status.rc != CMPI_RC_OK) goto exit;
 
+      /* Check that CMGetKey() also works and returns the same data */
+      data2 = CMGetKey(objectpath, namestring, &status);
+      if (status.rc != CMPI_RC_OK) {
+         _OSBASE_TRACE(1,("%s:_testkeys() CMGetKey(%s) failed", _PROVIDERNAME, namestring));
+         CMSetStatusWithChars(_BROKER, &status, CMPI_RC_ERROR_SYSTEM, "CMGetKey() failed");
+         goto exit;
+      }
+
+      /* Check that the CMGetKey() value state is the same */
+      if (data2.state != data.state) {
+         _OSBASE_TRACE(1,("%s:_testkeys() CMGetKey(%s) has different state", _PROVIDERNAME, namestring));
+         CMSetStatusWithChars(_BROKER, &status, CMPI_RC_ERROR_SYSTEM, "CMGetKey() has different state");
+         goto exit;
+      }
+
+      /* Check that the CMGetKey() value is the same */
+      if (!_CMSameValue(data, data2)) {
+         _OSBASE_TRACE(1,("%s:_testkeys() CMGetKey(%s) has different value", _PROVIDERNAME, namestring));
+         CMSetStatusWithChars(_BROKER, &status, CMPI_RC_ERROR_SYSTEM, "CMGetKey() has different value");
+         goto exit;
+      }
+
       /* If got here then the key is OK */
-      _OSBASE_TRACE(1,("%s:_testkeys() key #%d is OK", _PROVIDERNAME, i));
+      _OSBASE_TRACE(1,("%s:_testkeys() key #%d \"%s\" is OK", _PROVIDERNAME, i, namestring));
    }
 
   /* Finished */
@@ -745,18 +798,22 @@
 // ---------------------------------------------------------------------------
 
 
+/* _testmethodname() - run tests on the InvokeMethod() method name specified by the client */ 
 CMPIStatus _testmethodname( char * methodname )
 {
    CMPIStatus status = {CMPI_RC_OK, NULL};      /* Return status of CIM operations */
 
    _OSBASE_TRACE(1,("%s:_testmethodname() called", _PROVIDERNAME));
 
+   /* Check that the method name string is not null or empty  */
    if (methodname == NULL || *methodname == '\0') {
        _OSBASE_TRACE(1,("%s:_testmethodname() NULL method name", _PROVIDERNAME));
       CMSetStatusWithChars(_BROKER, &status, CMPI_RC_ERROR_SYSTEM, "NULL method name");
       goto exit;
    }
 
+   /* TODO - Check that the method name is recognized */
+
 exit:
    _OSBASE_TRACE(1,("%s:_testmethodname() %s", _PROVIDERNAME, (status.rc == CMPI_RC_OK)? "succeeded":"failed"));
    return status;
@@ -766,6 +823,7 @@
 // ---------------------------------------------------------------------------
 
 
+/* _testarguments() - run tests on the InvokeMethod() method arguments specified by the client */
 CMPIStatus _testarguments( CMPIArgs * args )
 {
    CMPIStatus status = {CMPI_RC_OK, NULL};      /* Return status of CIM operations */
@@ -773,6 +831,7 @@
    CMPIData data;                            /* CIM datum to extract argument values */
    CMPIString * name;
    char * valuestring = NULL;
+   char * namestring;
 
    _OSBASE_TRACE(1,("%s:_testarguments() called", _PROVIDERNAME));
 
@@ -802,13 +861,14 @@
          _OSBASE_TRACE(1,("%s:_testarguments() NULL argument name", _PROVIDERNAME));
          CMSetStatusWithChars(_BROKER, &status, CMPI_RC_ERROR_SYSTEM, "NULL argument name");
       }
+      namestring = CMGetCharPtr(name);
 
       status = _testpropertystate(data);
       if (status.rc != CMPI_RC_OK) goto exit;
 
 //      valuestring = _CMPIValueToString(data);
       _OSBASE_TRACE(2,("%s:_testarguments() arg #%d: name=\"%s\", type=%s(%d) value=%s", _PROVIDERNAME,
-                i, CMGetCharPtr(name), _CMPITypeName(data.type), data.type, valuestring));
+                i, namestring, _CMPITypeName(data.type), data.type, valuestring));
       if (valuestring != NULL) free(valuestring);
    }
 
@@ -824,7 +884,7 @@
 
 
 /* _makeinstance() - create a new CIM instance from the specified instance data */
-static CMPIStatus _makeinstance( CMPIInstance ** instance, _INSTANCEDATA * instancedata )
+static CMPIStatus _makeinstance( CMPIInstance ** instance, _INSTANCEDATA * instancedata, char * classname )
 {
    CMPIStatus status = {CMPI_RC_OK, NULL};      /* Return status of CIM operations */
    CMPIObjectPath * objectpath;			/* Object path of the new instance */
@@ -832,7 +892,7 @@
    _OSBASE_TRACE(1,("%s:_makeinstance() called", _PROVIDERNAME));
 
    /* Create a new CIM object path for the new instance */ 
-   objectpath = CMNewObjectPath(_BROKER, _NAMESPACE, _CLASSNAME, &status);
+   objectpath = CMNewObjectPath(_BROKER, _NAMESPACE, classname, &status);
    if ((status.rc != CMPI_RC_OK) || CMIsNullObject(objectpath)) {
       _OSBASE_TRACE(1,("%s:_makeinstance() CMNewObjectPath() failed - %s", _PROVIDERNAME, CMGetCharPtr(status.msg)));
       CMSetStatusWithChars(_BROKER, &status, CMPI_RC_ERROR_SYSTEM, "CMNewObjectPath() failed");
@@ -977,6 +1037,7 @@
    CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations */
    CMPIObjectPath * objectpath;			/* CIM object path of each new instance of this class */
    char * namespace;				/* Our current CIM namespace */
+   char * classname;				/* Classname to look for */
    int found = 0;                               /* Found any instances? */
    int i;
 
@@ -990,13 +1051,19 @@
    /* Check that the reference classname is correct */
    status = _testclassname(reference);
    if (status.rc != CMPI_RC_OK) goto exit;
-
+   classname = CMGetCharPtr(CMGetClassName(reference, NULL));
+   
    /* Go through the internal list of instances and return the object path of each */
    for (i=0; i<sizeinstances; i++) {
       if (instances[i] == NULL) continue;
 
-      /* Return the object path of the instance */
+      /* Get the instance's object path */
       objectpath = CMGetObjectPath(instances[i], NULL);
+
+      /* Check that the instance's class is the same as the reference class */
+      if (strcmp(CMGetCharPtr(CMGetClassName(objectpath,NULL)), classname) != 0) continue;
+
+      /* Return the object path of the instance */
       CMSetNameSpace(objectpath, namespace);
       CMReturnObjectPath(results, objectpath);
       found++;
@@ -1024,6 +1091,8 @@
 		char ** properties)		/* [in] List of desired properties (NULL=all) */
 {
    CMPIStatus status = {CMPI_RC_OK, NULL};	/* Return status of CIM operations */
+   CMPIObjectPath * objectpath;                 /* CIM object path of each new instance of this class */
+   char * classname;                            /* Classname to look for */
    int found = 0;                               /* Found any instances? */
    int i;
 
@@ -1036,18 +1105,17 @@
    /* Check that the reference classname is correct */
    status = _testclassname(reference);
    if (status.rc != CMPI_RC_OK) goto exit;
-
-   /* Test the reference object path */
-   status = _testobjectpath(reference, NULL);
-   if (status.rc != CMPI_RC_OK) {
-      _OSBASE_TRACE(1,("%s:EnumInstances() _testobjectpath() failed", self->ft->miName));
-      goto exit;
-   }
+   classname = CMGetCharPtr(CMGetClassName(reference, NULL));
 
    /* Go through the internal list of instances and return each */
    for (i=0; i<sizeinstances; i++) {
       if (instances[i] == NULL) continue;
 
+      /* Get the instance's object path */
+      objectpath = CMGetObjectPath(instances[i], NULL);
+
+      /* Check that the instance's class is the same as the reference class */
+      if (strcmp(CMGetCharPtr(CMGetClassName(objectpath,NULL)), classname) != 0) continue;
       /* Return this instance */
       CMReturnInstance(results, instances[i]);
       found++;
@@ -1351,7 +1419,6 @@
    status = _testselectexpr(selectexpr);
    if (status.rc != CMPI_RC_OK) goto exit;
 
-
    /* Go through the internal list of instances and evaluate each against the query */
    for (i=0; i<sizeinstances; i++) {
       if (instances[i] == NULL) continue;
@@ -1416,7 +1483,6 @@
    CMPIStatus status = {CMPI_RC_OK, NULL};      /* Return status of CIM operations */
    CMPIInstance * newinstance = NULL;		/* New instance to add to the internal list */
    CMPIObjectPath * newobjectpath = NULL;	/* New object path for each new instance */
-   _INSTANCEDATA newinstancedata;		/* Store raw instance data */
    int instancenum = 2;				/* Number of instances to populate the internal list */
   
    _OSBASE_TRACE(1,("%s:Initialize() called", self->ft->miName));
@@ -1430,11 +1496,51 @@
 
    /* Create sample instance(s) and add to the list of instances */
    while (instancenum > 0) {
-      _OSBASE_TRACE(1,("%s:Initialize() creating new instance", self->ft->miName));
+      _INSTANCEDATA newinstancedata;               /* Store raw instance data */
 
-      /* Generate raw instance data */
-      strncpy(newinstancedata.CreationClassName, _CLASSNAME, _MAXSTRINGLENGTH);
+      /* Initialize the minimum raw instance data for instances with default property values */
       snprintf(newinstancedata.Id, _MAXSTRINGLENGTH, "Instance #%d", instancenum);
+
+      _OSBASE_TRACE(1,("%s:Initialize() creating new instance", self->ft->miName));
+
+      /* Create a new TST_InstanceDefaults instance from the raw data */
+      strncpy(newinstancedata.CreationClassName, "TST_InstanceDefaults", _MAXSTRINGLENGTH);
+      status = _makeinstance(&newinstance, &newinstancedata, newinstancedata.CreationClassName);
+      if (status.rc != CMPI_RC_OK) {
+         _OSBASE_TRACE(1,("%s:Initialize() _makeinstance() failed", self->ft->miName));
+         goto exit;
+      }
+
+      /* Run tests on the newly created instance */
+      status = _testinstance(newinstance, NULL);
+      if (status.rc != CMPI_RC_OK) goto exit;
+
+      /* Get the object path of the newly created instance */
+      newobjectpath = CMGetObjectPath(newinstance, &status);
+      if (status.rc != CMPI_RC_OK) {
+         _OSBASE_TRACE(1,("%s:Initialize() CMGetObjectPath() failed", self->ft->miName));
+         goto exit;
+      }
+
+      /* Set the namespace of the new object path */
+      status = CMSetNameSpace(newobjectpath, _NAMESPACE);
+      if (status.rc != CMPI_RC_OK) {
+         _OSBASE_TRACE(1,("%s:Initialize() CMSetNameSpace() failed", self->ft->miName));
+         goto exit;
+      }
+
+      /* Run tests on the new object path */
+      status = _testobjectpath(newobjectpath, NULL);
+      if (status.rc != CMPI_RC_OK) goto exit;
+
+      /* Add the new CIM instance to the list of instances */
+      status = _addinstance(newinstance);
+      if (status.rc != CMPI_RC_OK) {
+         _OSBASE_TRACE(1,("%s:Initialize() _addinstance() failed", self->ft->miName));
+         goto exit;
+      }
+
+      /* Initialize the rest of the raw instance data */
       snprintf(newinstancedata.Property_string, _MAXSTRINGLENGTH, "This is instance #%d", instancenum);
       newinstancedata.Property_uint8 = (CMPIUint8)255;
       newinstancedata.Property_uint16 = (CMPIUint16)65535;
@@ -1449,10 +1555,12 @@
       newinstancedata.Property_real64 = (CMPIReal64)0.123456789012345e38;
       newinstancedata.Property_dateTime = CMNewDateTimeFromChars(_BROKER,"20050503104354.000000:000",NULL);
       newinstancedata.Property_char16 = (CMPIChar16)'a';
-      instancenum--;
 
-      /* Create a new CIM instance from the raw data */
-      status = _makeinstance(&newinstance, &newinstancedata);
+      _OSBASE_TRACE(1,("%s:Initialize() creating new instance", self->ft->miName));
+
+      /* Create a new TST_InstanceProperties instance from the raw data */
+      strncpy(newinstancedata.CreationClassName, "TST_InstanceProperties", _MAXSTRINGLENGTH);
+      status = _makeinstance(&newinstance, &newinstancedata, newinstancedata.CreationClassName);
       if (status.rc != CMPI_RC_OK) {
          _OSBASE_TRACE(1,("%s:Initialize() _makeinstance() failed", self->ft->miName));
          goto exit;
@@ -1486,6 +1594,43 @@
          _OSBASE_TRACE(1,("%s:Initialize() _addinstance() failed", self->ft->miName));
          goto exit;
       }
+
+      _OSBASE_TRACE(1,("%s:Initialize() creating new instance", self->ft->miName));
+
+      /* Create a new TST_InstanceKeys instance from the same raw data */
+      strncpy(newinstancedata.CreationClassName, "TST_InstanceKeys", _MAXSTRINGLENGTH);
+      status = _makeinstance(&newinstance, &newinstancedata, newinstancedata.CreationClassName);
+      if (status.rc != CMPI_RC_OK) {
+         _OSBASE_TRACE(1,("%s:Initialize() _makeinstance() failed", self->ft->miName));
+         goto exit;
+      }
+
+      /* Get the object path of the newly created instance */
+      newobjectpath = CMGetObjectPath(newinstance, &status);
+      if (status.rc != CMPI_RC_OK) {
+         _OSBASE_TRACE(1,("%s:Initialize() CMGetObjectPath() failed", self->ft->miName));
+         goto exit;
+      }
+
+      /* Set the namespace of the new object path */
+      status = CMSetNameSpace(newobjectpath, _NAMESPACE);
+      if (status.rc != CMPI_RC_OK) {
+         _OSBASE_TRACE(1,("%s:Initialize() CMSetNameSpace() failed", self->ft->miName));
+         goto exit;
+      }
+
+      /* Run tests on the new object path */
+      status = _testobjectpath(newobjectpath, &newinstancedata);
+      if (status.rc != CMPI_RC_OK) goto exit;
+
+      /* Add the new CIM instance to the list of instances */
+      status = _addinstance(newinstance);
+      if (status.rc != CMPI_RC_OK) {
+         _OSBASE_TRACE(1,("%s:Initialize() _addinstance() failed", self->ft->miName));
+         goto exit;
+      }
+
+      instancenum--;
    }
 
    /* Finished */

Index: cmpiutil.c
===================================================================
RCS file: /cvsroot/sblim/cmpi-tests/cmpi-instancetest/src/cmpiutil.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- cmpiutil.c	6 May 2005 22:56:19 -0000	1.1.1.1
+++ cmpiutil.c	12 May 2005 00:53:19 -0000	1.2
@@ -325,9 +325,7 @@
          if (CMIsNullObject(data.value.string)) return NULL;
          char * str = CMGetCharPtr(data.value.string);
          if (str == NULL) return NULL;
-_OSBASE_TRACE(1,("DEBUG: before strdup"));
          valuestring = strdup(str);
-_OSBASE_TRACE(1,("DEBUG: after strdup"));
          return valuestring;
       }
       case CMPI_boolean:

[Sblim-commit] cmpi-tests/cmpi-instancetest/schema TST_InstanceDefaults.mof,NONE,1.1 TST_InstanceKeys.mof,1.1.1.1,1.2 TST_InstanceTest.registration,1.1.1.1,1.2

[Gareth S B. <bes...@us...>]

Update of /cvsroot/sblim/cmpi-tests/cmpi-instancetest/schema
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18110

Modified Files:
	TST_InstanceKeys.mof TST_InstanceTest.registration 
Added Files:
	TST_InstanceDefaults.mof 
Log Message:
added support for defaults class, fixed dateTime type syntax error


--- NEW FILE: TST_InstanceDefaults.mof ---
[
Abstract, Version ("2.2.0"),
Description ("Test class containing all the simple property types")
]
class TST_InstanceDefaults : CIM_ManagedElement
{  
   [Key, Description ("Name of the class that created this instance")]
   string CreationClassName = "TST_InstanceDefaults";

   [Key, Description ("Unique identifier for each instance of this class")]  
   string Id = "Instance #?";

   /* EXPAND THIS CLASS BY DEFINING MORE PROPERTIES HERE */

   [Maxlen(256), Description ("a string property")]
   string Property_string = "This is a string";

   [Description ("a uint8 property")]
   uint8 Property_uint8 = 42;

   [Description ("a uint16 property")]
   uint16 Property_uint16 = 4200;

   [Description ("a uint32 property")]
   uint32 Property_uint32 = 420000;

   [Description ("a uint64 property")]
   uint64 Property_uint64 = 42000000;

   [Description ("a sint8 property")]
   sint8 Property_sint8 = -42;

   [Description ("a sint16 property")]
   sint16 Property_sint16 = -4200;

   [Description ("a sint32 property")]
   sint32 Property_sint32 = -420000;

   [Description ("a sint64 property")]
   sint64 Property_sint64 = -42000000;

   [Description ("a boolean property")]
   boolean Property_boolean = 1;

   [Description ("a real32 property")]
   real32 Property_real32 = 1.2345;

   [Description ("a real64 property")]
   real64 Property_real64 = 1.234567890;

   [Description ("a dateTime property")]
   dateTime Property_dateTime = "20050503104354.000000:000";

   [Description ("a char16 property")]
   char16 Property_char16 = "a";
};

Index: TST_InstanceTest.registration
===================================================================
RCS file: /cvsroot/sblim/cmpi-tests/cmpi-instancetest/schema/TST_InstanceTest.registration,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- TST_InstanceTest.registration	6 May 2005 19:09:57 -0000	1.1.1.1
+++ TST_InstanceTest.registration	11 May 2005 23:27:06 -0000	1.2
@@ -3,3 +3,5 @@
 #    <CLASSNAME> <NAMESPACE> <PROVIDERNAME> <LIBRARYNAME> <TYPE> ...
 # where TYPE(S) = "instance" | "association" | "indication" | "method"
 TST_InstanceProperties root/cimv2 TST_InstanceTestProvider TST_InstanceTest instance method
+TST_InstanceKeys root/cimv2 TST_InstanceTestProvider TST_InstanceTest instance method
+TST_InstanceDefaults root/cimv2 TST_InstanceTestProvider TST_InstanceTest instance method

Index: TST_InstanceKeys.mof
===================================================================
RCS file: /cvsroot/sblim/cmpi-tests/cmpi-instancetest/schema/TST_InstanceKeys.mof,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- TST_InstanceKeys.mof	4 May 2005 01:03:41 -0000	1.1.1.1
+++ TST_InstanceKeys.mof	11 May 2005 23:27:06 -0000	1.2
@@ -42,15 +42,17 @@
    [Key, Description ("a boolean key property")]
    boolean Property_boolean;
 
-   [Key, Description ("a real32 key property")]
+   /* The following property types cannot be used as keys */
+
+   [Description ("a real32 property")]
    real32 Property_real32;
 
-   [Key, Description ("a real64 key property")]
+   [Description ("a real64 property")]
    real64 Property_real64;
 
-   [Key, Description ("a dateTime key property")]
-   datetime Property_dateTime;
+   [Description ("a dateTime property")]
+   dateTime Property_dateTime;
 
-   [Key, Description ("a char16 key property")]
+   [Description ("a char16 property")]
    char16 Property_char16;
 };

[Sblim-commit] indication_helper ChangeLog,1.1.1.1,1.2 NEWS,1.1.1.1,1.2 configure.ac,1.5,1.6 ind_helper.h,1.2,1.3

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/indication_helper
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24773

Modified Files:
	ChangeLog NEWS configure.ac ind_helper.h 
Log Message:
Bugs fixed: 1199449 (well sort of).
Fixed compile errors caused by CMPI_VER_86 redefinition.


Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/indication_helper/NEWS,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- NEWS	2 Feb 2005 19:06:51 -0000	1.1.1.1
+++ NEWS	11 May 2005 14:07:06 -0000	1.2
@@ -0,0 +1,5 @@
+Changes in 0.4.0
+================
+
+Bugs:
+- 1199449 fixed compile problem in connection with a cmpi-base build problem.

Index: configure.ac
===================================================================
RCS file: /cvsroot/sblim/indication_helper/configure.ac,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- configure.ac	19 Apr 2005 12:21:08 -0000	1.5
+++ configure.ac	11 May 2005 14:07:06 -0000	1.6
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.53)
-AC_INIT(SBLIM Indication Helper, 0.3.1a, sbl...@li...,sblim-indication_helper)
+AC_INIT(SBLIM Indication Helper, 0.4.0, sbl...@li...,sblim-indication_helper)
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([ind_helper.c])
 AM_CONFIG_HEADER(config.h)
@@ -62,7 +62,6 @@
 
 CC_WARNINGS="\
 	-Wall \
-	-Werror \
         -Wmissing-prototypes \
 	-Wmissing-declarations \
 	-Wstrict-prototypes \
@@ -75,7 +74,6 @@
 
 CXX_WARNINGS="\
 	-Wall\
-	-Werror\
         -Wmissing-prototypes \
 	-Wstrict-prototypes \
 	-Wpointer-arith \

Index: ind_helper.h
===================================================================
RCS file: /cvsroot/sblim/indication_helper/ind_helper.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ind_helper.h	19 Apr 2005 16:04:16 -0000	1.2
+++ ind_helper.h	11 May 2005 14:07:06 -0000	1.3
@@ -14,7 +14,7 @@
  * Date  :	      09/20/2004
  */
 
-#define CMPI_VER_86 1
+#define CMPI_VERSION 90
 #include <cmpift.h>
 
 typedef unsigned int Uint32;

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/indication_helper/ChangeLog,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- ChangeLog	2 Feb 2005 19:06:51 -0000	1.1.1.1
+++ ChangeLog	11 May 2005 14:07:06 -0000	1.2
@@ -0,0 +1,7 @@
+2005-05-11    <mih...@dy...>
+
+	* ind_helper.h: replace CMPI_VER_nn macro by CMPI_VERSION
+
+	* configure.ac: removed -Werror flag as this leads to make distcheck
+	failure.
+

[Sblim-commit] cmpi-base ChangeLog,1.6,1.7 NEWS,1.2,1.3 cmpiOSBase_OperatingSystemProvider.c,1.14,1.15

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/cmpi-base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23217

Modified Files:
	ChangeLog NEWS cmpiOSBase_OperatingSystemProvider.c 
Log Message:
Fixed bugs: 1199449.
Adapted to new indication_helper signature.


Index: cmpiOSBase_OperatingSystemProvider.c
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/cmpiOSBase_OperatingSystemProvider.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- cmpiOSBase_OperatingSystemProvider.c	14 Apr 2005 14:37:05 -0000	1.14
+++ cmpiOSBase_OperatingSystemProvider.c	11 May 2005 14:00:44 -0000	1.15
@@ -23,10 +23,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#ifndef NOEVENTS
-#define CMPI_VER_86 1
-#endif
-
 #include "cmpidt.h"
 #include "cmpift.h"
 #include "cmpimacs.h"
@@ -537,7 +533,8 @@
     if(ind_reg_pollfnc(INDCLASSNAME,
 		       "Poll function",
 		       check,
-		       10) != IND_OK) {
+		       10,
+		       IND_BEHAVIOUR_LEVEL_EDGE) != IND_OK) {
       _OSBASE_TRACE(1,("--- %s ind_init() failed: register poll function",_ClassName));
       CMRelease(sourceInstance);
       return;

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ChangeLog	11 May 2005 11:40:08 -0000	1.6
+++ ChangeLog	11 May 2005 14:00:44 -0000	1.7
@@ -1,3 +1,11 @@
+2005-05-11    <mih...@dy...>
+
+	* cmpiOSBase_OperatingSystemProvider.c:
+	Bug 1199449: Removed CMPI_VER_86 definition as the CMPI_VER_nn
+	macros are not for provider usage. Further, fixed the ind_reg_pollfnc
+	invokation.
+	
+
 2005-05-10    <mih...@dy...>
 
 	* configure.ac: Bug 1199129 added -DCMPI_VERSION=90 to CPPFLAGS 

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/NEWS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- NEWS	11 May 2005 11:40:08 -0000	1.2
+++ NEWS	11 May 2005 14:00:44 -0000	1.3
@@ -3,3 +3,4 @@
 
 Bugs:
 - 1199129 Added toleration for newer (spec-conforming) CMPI headers.
+- 1199449 Fixed compile problem with new indication_helper 0.4.0 .

[Sblim-commit] cmpi-fsvol/mof Linux_Fsvol.registration,1.1,1.2

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/cmpi-fsvol/mof
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28824/mof

Modified Files:
	Linux_Fsvol.registration 
Log Message:
Bugs fixed 1199129 1199146.
Added toleration for build with CMPI 1.0.0 headers.
Added registration for new StatisticalData class.


Index: Linux_Fsvol.registration
===================================================================
RCS file: /cvsroot/sblim/cmpi-fsvol/mof/Linux_Fsvol.registration,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Linux_Fsvol.registration	2 May 2005 15:50:08 -0000	1.1
+++ Linux_Fsvol.registration	11 May 2005 12:04:27 -0000	1.2
@@ -6,3 +6,4 @@
 Linux_HostedFileSystem root/cimv2 OSBase_HostedFileSystemProvider cmpiOSBase_HostedFileSystemProvider instance association
 Linux_BootOSFromFS root/cimv2 OSBase_BootOSFromFSProvider cmpiOSBase_BootOSFromFSProvider instance association
 Linux_CSProcessor root/cimv2 OSBase_CSProcessorProvider cmpiOSBase_CSProcessorProvider instance association
+Linux_BlockStorageStatisticalData root/cimv2 OSBase_BlockStorageStatisticalDataProvider cmpiOSBase_BlockStorageStatisticalDataProvider instance

[Sblim-commit] cmpi-fsvol ChangeLog,1.3,1.4 NEWS,1.1,1.2 configure.ac,1.3,1.4

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/cmpi-fsvol
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28824

Modified Files:
	ChangeLog NEWS configure.ac 
Log Message:
Bugs fixed 1199129 1199146.
Added toleration for build with CMPI 1.0.0 headers.
Added registration for new StatisticalData class.


Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/cmpi-fsvol/NEWS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- NEWS	15 Apr 2005 14:28:15 -0000	1.1
+++ NEWS	11 May 2005 12:04:26 -0000	1.2
@@ -0,0 +1,6 @@
+Changes in 1.4.1
+================
+
+Bugs:
+- 1199129 Added toleration for newer (spec-conforming) CMPI headers.
+- 1199146 Added missing registration for BlockDeviceStatisticalData.

Index: configure.ac
===================================================================
RCS file: /cvsroot/sblim/cmpi-fsvol/configure.ac,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- configure.ac	20 Apr 2005 11:40:19 -0000	1.3
+++ configure.ac	11 May 2005 12:04:26 -0000	1.4
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(SBLIM BaseOS Filesystem Providers, 1.4.0, sbl...@li...,sblim-cmpi-fsvol)
+AC_INIT(SBLIM BaseOS Filesystem Providers, 1.4.0a, sbl...@li...,sblim-cmpi-fsvol)
 AC_CONFIG_SRCDIR([OSBase_CommonFsvol.c])
 AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE
@@ -59,6 +59,12 @@
 
 AC_CONFIG_FILES([Makefile sblim-cmpi-fsvol.spec])
 
+# Extend CPPFLAGS
+if echo $CPPFLAGS | grep -v CMPI_VERSION
+then
+   CPPFLAGS="$CPPFLAGS -DCMPI_VERSION=90"
+fi
+
 if test x"$TESTSUITEDIR" == x; then
    TESTSUITE_SUPPORT=Disabled
 else	

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/cmpi-fsvol/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ChangeLog	2 May 2005 15:50:07 -0000	1.3
+++ ChangeLog	11 May 2005 12:04:26 -0000	1.4
@@ -1,3 +1,11 @@
+2005-05-10    <mih...@dy...>
+
+	* mof/Linux_Fsvol.registration: Bug 1199146 added missing
+	line for Linux_BlockDeviceStatisticalData class.
+
+	* configure.ac: Bug 1199129 add -DCMPI_VERSION=90 to CPPFLAGS 
+	to ensure compatibility when compiled with newer CMPI headers.
+
 2005-05-02    <mih...@dy...>
 
 	* mof/Linux_Fsvol.registration: New registration file format.

[Sblim-commit] cmpi-network ChangeLog,1.2,1.3 NEWS,1.2,1.3 configure.ac,1.2,1.3

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/cmpi-network
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24851

Modified Files:
	ChangeLog NEWS configure.ac 
Log Message:
Bugs fixed: 1199129.
Now compiles with cmpi-devel 1.0.0.


Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/cmpi-network/NEWS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- NEWS	4 May 2005 14:43:48 -0000	1.2
+++ NEWS	11 May 2005 11:42:02 -0000	1.3
@@ -1,3 +1,9 @@
+Changes in 1.3.5
+================
+
+Bugs:
+- 1199129 Added toleration for newer (spec-conforming) CMPI headers.
+
 Changes in 1.3.4
 ================
 

Index: configure.ac
===================================================================
RCS file: /cvsroot/sblim/cmpi-network/configure.ac,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- configure.ac	4 May 2005 14:43:48 -0000	1.2
+++ configure.ac	11 May 2005 11:42:02 -0000	1.3
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(SBLIM BaseOS Network Providers, 1.3.4, sbl...@li...,sblim-cmpi-network)
+AC_INIT(SBLIM BaseOS Network Providers, 1.3.4a, sbl...@li...,sblim-cmpi-network)
 AC_CONFIG_SRCDIR([OSBase_CommonNetwork.c])
 AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE
@@ -64,6 +64,13 @@
 else	
    TESTSUITE_SUPPORT=Enabled
 fi
+
+# Extend CPPFLAGS
+if echo $CPPFLAGS | grep -v CMPI_VERSION
+then
+   CPPFLAGS="$CPPFLAGS -DCMPI_VERSION=90"
+fi
+
 # Display configuration options
 echo "-------------------------------------------------------"
 echo "Configuration for $PACKAGE complete."

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/cmpi-network/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ChangeLog	4 May 2005 14:43:48 -0000	1.2
+++ ChangeLog	11 May 2005 11:42:02 -0000	1.3
@@ -1,3 +1,8 @@
+2005-05-10    <mih...@dy...>
+
+	* configure.ac: Bug 1199129: add -DCMPI_VERSION=90 to CPPFLAGS to 
+	ensure compatibility when compiled with newer CMPI headers.
+
 2005-05-04    <mih...@dy...>
 
 	* test/system/linux/Linux_IPProtocolEndpoint.system: 

[Sblim-commit] cmpi-base ChangeLog,1.5,1.6 NEWS,1.1,1.2 configure.ac,1.5,1.6

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/cmpi-base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24430

Modified Files:
	ChangeLog NEWS configure.ac 
Log Message:
Bugs fixed: 1199129.
Now compiles with cmpi-devel 1.0.0.


Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/NEWS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- NEWS	6 Apr 2005 16:29:47 -0000	1.1
+++ NEWS	11 May 2005 11:40:08 -0000	1.2
@@ -0,0 +1,5 @@
+Changes in 1.5.1
+================
+
+Bugs:
+- 1199129 Added toleration for newer (spec-conforming) CMPI headers.

Index: configure.ac
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/configure.ac,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- configure.ac	20 Apr 2005 11:34:56 -0000	1.5
+++ configure.ac	11 May 2005 11:40:08 -0000	1.6
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(SBLIM BaseOS Providers Base, 1.5.0, sbl...@li...,sblim-cmpi-base)
+AC_INIT(SBLIM BaseOS Providers Base, 1.5.0a, sbl...@li...,sblim-cmpi-base)
 AC_CONFIG_SRCDIR([OSBase_Common.c])
 AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE
@@ -86,7 +86,13 @@
 AM_CONDITIONAL(NOEVENTS,[test x"$EVENTFLAGS" != x])
 
 # Extend CPPFLAGS
-CPPFLAGS="$CPPFLAGS -D$HW $EVENTFLAGS"
+if echo $CPPFLAGS | grep -v CMPI_VERSION
+then
+   CPPFLAGS="$CPPFLAGS -D$HW $EVENTFLAGS -DCMPI_VERSION=90"
+else
+   CPPFLAGS="$CPPFLAGS -D$HW $EVENTFLAGS"
+fi
+
 if test x"$EVENTFLAGS" == x; then
    INDICATION_SUPPORT=Enabled
 else	

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ChangeLog	20 Apr 2005 11:34:55 -0000	1.5
+++ ChangeLog	11 May 2005 11:40:08 -0000	1.6
@@ -1,4 +1,7 @@
+2005-05-10    <mih...@dy...>
 
+	* configure.ac: Bug 1199129 added -DCMPI_VERSION=90 to CPPFLAGS 
+	in order to support newer CMPI header versions.
 
 // ===================================================================
 // new in version 1.2.3 :

[Sblim-commit] cmpi-devel NEWS,1.1.1.1,1.2 README,1.1.1.1,1.2

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/cmpi-devel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16666

Modified Files:
	NEWS README 
Log Message:
README/NEWS updated.


Index: README
===================================================================
RCS file: /cvsroot/sblim/cmpi-devel/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- README	18 Mar 2005 13:45:38 -0000	1.1.1.1
+++ README	11 May 2005 11:04:09 -0000	1.2
@@ -17,3 +17,10 @@
 /usr/lib or /usr/local/lib 
 
 We recommend the /usr/local prefix for testing purposes only
+
+CMPI 1.0 and existing providers
+===============================
+
+If you plan to build CMPI providers written before release 1.0.0 availability
+add "#define CMPI_VERSION 90" to the provider source or compile with 
+-DCMPI_VERSION=90 option.

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/cmpi-devel/NEWS,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- NEWS	18 Mar 2005 13:45:39 -0000	1.1.1.1
+++ NEWS	11 May 2005 11:04:09 -0000	1.2
@@ -0,0 +1,7 @@
+Changes in 1.0.0
+================
+
+Release 1.0.0 is now implementing the function signatures as required
+by the Open Group spec. CMPI providers written before 1.0.0 will require
+that the macro CMPI_VERSION is set to 90 (or some other valid release id) in
+order to build.

[Sblim-commit] sfcb wbemcat,1.2,1.3

[Gareth S B. <bes...@us...>]

Update of /cvsroot/sblim/sfcb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10730

Modified Files:
	wbemcat 
Log Message:


Index: wbemcat
===================================================================
RCS file: /cvsroot/sblim/sfcb/wbemcat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- wbemcat	9 May 2005 16:44:43 -0000	1.2
+++ wbemcat	10 May 2005 18:00:37 -0000	1.3
@@ -43,7 +43,7 @@
 # Process command line options, if any
 GetOptions("host|h=s" => \$host,
 	   "port|p=i" => \$port,
-           "help|?" => usage) || usage;
+           "help|?" => sub{usage}) || usage;
 my $file = @ARGV[0];
 
 # Read all the XML data from the input file

[Sblim-commit] ecute plugin.properties,1.4,1.5

[Benjamin B. <bg...@us...>]

Update of /cvsroot/sblim/ecute
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24245

Modified Files:
	plugin.properties 
Log Message:
Version 2.1 alpha 6d
Edit qualifiers dialog with main functionality added to RSA

Index: plugin.properties
===================================================================
RCS file: /cvsroot/sblim/ecute/plugin.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- plugin.properties	6 Dec 2004 17:17:40 -0000	1.4
+++ plugin.properties	10 May 2005 16:40:54 -0000	1.5
@@ -7,6 +7,6 @@
 exportCIMMOFWizard=CIM MOF Files
 exportCIMMOFDescription=Export CIM MOF files.
 
-PropertyTab.label=Qualifiers
+PropertyTab.label=CIM Qualifiers
 
 ext.ecuteWizardsShortcut=eCute Wizards Perspective Shortcuts
\ No newline at end of file

[Sblim-commit] cmpi-devel ChangeLog,1.1.1.1,1.2 CmpiImpl.cpp,1.1.1.1,1.2 configure.ac,1.2,1.3

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/cmpi-devel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11414

Modified Files:
	ChangeLog CmpiImpl.cpp configure.ac 
Log Message:
Bugs fixed: 1199111.
The header files and the C++ wrapper have been brought up to the TOG spec
level (1.0).


Index: configure.ac
===================================================================
RCS file: /cvsroot/sblim/cmpi-devel/configure.ac,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- configure.ac	18 Mar 2005 15:13:31 -0000	1.2
+++ configure.ac	10 May 2005 15:50:18 -0000	1.3
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT(sblim-cmpi-devel, 0.9.0, <mih...@de...>)
+AC_INIT(sblim-cmpi-devel, 1.0.0, <mih...@de...>)
 AC_CONFIG_SRCDIR([CmpiImpl.cpp])
 AC_CONFIG_HEADER([config.h])
 

Index: CmpiImpl.cpp
===================================================================
RCS file: /cvsroot/sblim/cmpi-devel/CmpiImpl.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- CmpiImpl.cpp	18 Mar 2005 13:45:39 -0000	1.1.1.1
+++ CmpiImpl.cpp	10 May 2005 15:50:17 -0000	1.2
@@ -21,6 +21,7 @@
  */
 
 #define CMPI_WRAPPER_IMPL
+#define CMPI_VERSION 100
 
 #include "CmpiInstance.h"
 #include "CmpiObjectPath.h"
@@ -1177,8 +1178,7 @@
 
 void CmpiInstance::setPropertyFilter(const char** properties, const char** keys) {
   if (keys==0) keys = _nullkeys;
-  CMPIStatus rc=getEnc()->ft->setPropertyFilter(getEnc(),(char**)properties,
-						 (char**)keys);
+  CMPIStatus rc=getEnc()->ft->setPropertyFilter(getEnc(),properties,keys);
   if (rc.rc!=CMPI_RC_OK) throw CmpiStatus(rc);
 }
 
@@ -1201,7 +1201,7 @@
 }
 CmpiStatus::CmpiStatus(const CMPIrc rcp, const char *msg) {
    st.rc=rcp;
-   st.msg=CMNewString(CmpiProviderBase::getBroker(),(char*)msg,NULL);
+   st.msg=CMNewString(CmpiProviderBase::getBroker(),msg,NULL);
 }
 
 CMPIrc CmpiStatus::rc() const {
@@ -1454,7 +1454,7 @@
 {
    CMPIStatus rc={CMPI_RC_OK,NULL};
    CMPIInstance* ci=getEnc()->bft->getInstance
-     (getEnc(),ctx.getEnc(),cop.getEnc(),(char **)properties,&rc);
+     (getEnc(),ctx.getEnc(),cop.getEnc(),properties,&rc);
    if (rc.rc!=CMPI_RC_OK) throw CmpiStatus(rc);
    return CmpiInstance(ci);
 }
@@ -1475,8 +1475,8 @@
 void CmpiBroker::setInstance(const CmpiContext& ctx, const CmpiObjectPath& cop,
                              const CmpiInstance& inst, const char** properties)
 {
-   CMPIStatus rc=getEnc()->bft->setInstance
-     (getEnc(),ctx.getEnc(),cop.getEnc(),inst.getEnc(), (char**)properties);
+   CMPIStatus rc=getEnc()->bft->modifyInstance
+     (getEnc(),ctx.getEnc(),cop.getEnc(),inst.getEnc(), properties);
    if (rc.rc!=CMPI_RC_OK) throw CmpiStatus(rc);
 }
 
@@ -1502,7 +1502,7 @@
 {
    CMPIStatus rc={CMPI_RC_OK,NULL};
    CMPIEnumeration* en=getEnc()->bft->enumInstances
-      (getEnc(),ctx.getEnc(),cop.getEnc(),(char**)properties,&rc);
+      (getEnc(),ctx.getEnc(),cop.getEnc(),properties,&rc);
    if (rc.rc!=CMPI_RC_OK) throw CmpiStatus(rc);
    return CmpiEnumeration(en);
 }
@@ -1576,7 +1576,7 @@
 
 
 CmpiString::CmpiString(const CmpiString& s) {
-  enc=CMNewString(CmpiProviderBase::getBroker(),(char*)s.charPtr(),NULL);
+  enc=CMNewString(CmpiProviderBase::getBroker(),s.charPtr(),NULL);
 }
 
 CmpiString::CmpiString(CMPIString* c) {
@@ -1859,7 +1859,7 @@
 
 void *CmpiDateTime::makeDateTime(CMPIBroker *mb, const char* utcTime) {
    CMPIStatus rc={CMPI_RC_OK,NULL};
-   void *dt=mb->eft->newDateTimeFromChars(mb,(char*)utcTime,&rc);
+   void *dt=mb->eft->newDateTimeFromChars(mb,utcTime,&rc);
    if (rc.rc!=CMPI_RC_OK) throw CmpiStatus(rc);
    return dt;
 }

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/cmpi-devel/ChangeLog,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- ChangeLog	18 Mar 2005 13:45:39 -0000	1.1.1.1
+++ ChangeLog	10 May 2005 15:50:17 -0000	1.2
@@ -0,0 +1,15 @@
+2005-05-10    <mih...@dy...>
+
+	* CmpiImpl.cpp: Bug 1199111 Changed from setInstance to modifyInstance.
+	Removed some type now superfluous type cast.
+
+	* configure.ac: New version number.
+
+	* cmpi/cmpimacs.h: Bug 1199111 Changed function signatures to comply
+	with spec.
+
+	* cmpi/cmpift.h: Bug 1199111 Changed function signatures to comply
+	with spec.
+
+	* cmpi/cmpidt.h: Bug 1199111 Changed function signatures to comply
+	with spec.