Menu
▾
▴
sblim-commit — CVS Commit Info for SBLIM
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
(1) |
Mar
(45) |
Apr
(150) |
May
(145) |
Jun
(150) |
Jul
(79) |
Aug
(313) |
Sep
(160) |
Oct
(309) |
Nov
(115) |
Dec
(60) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(160) |
Feb
(144) |
Mar
(127) |
Apr
(48) |
May
(102) |
Jun
(54) |
Jul
(245) |
Aug
(94) |
Sep
(152) |
Oct
(162) |
Nov
(166) |
Dec
(740) |
| 2007 |
Jan
(752) |
Feb
(437) |
Mar
(328) |
Apr
(373) |
May
(569) |
Jun
(399) |
Jul
(369) |
Aug
(627) |
Sep
(100) |
Oct
(306) |
Nov
(166) |
Dec
(282) |
| 2008 |
Jan
(68) |
Feb
(145) |
Mar
(180) |
Apr
(160) |
May
(277) |
Jun
(229) |
Jul
(1188) |
Aug
(51) |
Sep
(97) |
Oct
(99) |
Nov
(95) |
Dec
(170) |
| 2009 |
Jan
(39) |
Feb
(73) |
Mar
(120) |
Apr
(121) |
May
(104) |
Jun
(262) |
Jul
(57) |
Aug
(171) |
Sep
(131) |
Oct
(88) |
Nov
(64) |
Dec
(83) |
| 2010 |
Jan
(55) |
Feb
(67) |
Mar
(124) |
Apr
(64) |
May
(130) |
Jun
(75) |
Jul
(164) |
Aug
(64) |
Sep
(44) |
Oct
(17) |
Nov
(43) |
Dec
(31) |
| 2011 |
Jan
(21) |
Feb
(10) |
Mar
(43) |
Apr
(46) |
May
(52) |
Jun
(71) |
Jul
(7) |
Aug
(16) |
Sep
(51) |
Oct
(14) |
Nov
(33) |
Dec
(15) |
| 2012 |
Jan
(12) |
Feb
(61) |
Mar
(129) |
Apr
(76) |
May
(70) |
Jun
(52) |
Jul
(29) |
Aug
(41) |
Sep
(32) |
Oct
(23) |
Nov
(38) |
Dec
(26) |
| 2013 |
Jan
(35) |
Feb
(37) |
Mar
(51) |
Apr
(15) |
May
(52) |
Jun
(15) |
Jul
(23) |
Aug
(21) |
Sep
(46) |
Oct
(69) |
Nov
(57) |
Dec
(26) |
| 2014 |
Jan
(5) |
Feb
(13) |
Mar
(17) |
Apr
(1) |
May
(5) |
Jun
|
Jul
(2) |
Aug
(2) |
Sep
(1) |
Oct
(16) |
Nov
(8) |
Dec
(4) |
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(1) |
Jun
(4) |
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
|
From: Gareth S B. <bes...@us...> - 2005-05-18 04:51:50
|
Update of /cvsroot/sblim/sfcb/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10148 Added Files: enumerateclasses.ALL.xml enumerateclasses.FIRSTTIME.OK enumerateclasses.FIRSTTIME.xml enumerateinstancenames.Linux_OperatingSystem.xml enumerateinstances.Linux_OperatingSystem.xml getclass.Linux_OperatingSystem.xml Log Message: added some basic wbemcat tst files (against cmpi-base Linux_OperatingSystem class) --- NEW FILE: enumerateclasses.FIRSTTIME.xml --- <?xml version="1.0" encoding="utf-8"?> <CIM CIMVERSION="2.0" DTDVERSION="2.0"> <MESSAGE ID="4711" PROTOCOLVERSION="1.0"> <SIMPLEREQ> <IMETHODCALL NAME="EnumerateClasses"> <LOCALNAMESPACEPATH> <NAMESPACE NAME="root"/> <NAMESPACE NAME="cimv2"/> </LOCALNAMESPACEPATH> </IMETHODCALL> </SIMPLEREQ> </MESSAGE> </CIM> --- NEW FILE: enumerateinstances.Linux_OperatingSystem.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><NAMESPACE NAME="cimv2"></NAMESPACE></LOCALNAMESPACEPATH> <IPARAMVALUE NAME="ClassName"><CLASSNAME NAME="Linux_OperatingSystem"/></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> --- NEW FILE: enumerateinstancenames.Linux_OperatingSystem.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="Linux_OperatingSystem"/></IPARAMVALUE> </IMETHODCALL></SIMPLEREQ> </MESSAGE></CIM> --- NEW FILE: enumerateclasses.ALL.xml --- <?xml version="1.0" encoding="utf-8"?> <CIM CIMVERSION="2.0" DTDVERSION="2.0"> <MESSAGE ID="4711" PROTOCOLVERSION="1.0"> <SIMPLEREQ> <IMETHODCALL NAME="EnumerateClasses"> <LOCALNAMESPACEPATH> <NAMESPACE NAME="root"/> <NAMESPACE NAME="cimv2"/> </LOCALNAMESPACEPATH> <IPARAMVALUE NAME="ClassName"> <CLASSNAME NAME=""/> </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> --- NEW FILE: getclass.Linux_OperatingSystem.xml --- <?xml version="1.0" encoding="utf-8" ?> <CIM CIMVERSION="2.0" DTDVERSION="2.0"> <MESSAGE ID="4711" PROTOCOLVERSION="1.0"><SIMPLEREQ><IMETHODCALL NAME="GetClass"> <LOCALNAMESPACEPATH> <NAMESPACE NAME="root"/> <NAMESPACE NAME="cimv2"/> </LOCALNAMESPACEPATH> <IPARAMVALUE NAME="ClassName"><CLASSNAME NAME="Linux_OperatingSystem"/></IPARAMVALUE> <IPARAMVALUE NAME="LocalOnly"><VALUE>FALSE</VALUE></IPARAMVALUE> <IPARAMVALUE NAME="IncludeQualifiers"><VALUE>TRUE</VALUE></IPARAMVALUE> <IPARAMVALUE NAME="IncludeClassOrigin"><VALUE>TRUE</VALUE></IPARAMVALUE> </IMETHODCALL></SIMPLEREQ> </MESSAGE></CIM> --- NEW FILE: enumerateclasses.FIRSTTIME.OK --- HTTP/1.1 200 OK Content-Type: application/xml; charset="utf-8" Content-Length: 295 Cache-Control: no-cache CIMOperation: MethodResponse <?xml version="1.0" encoding="utf-8" ?> <CIM CIMVERSION="2.0" DTDVERSION="1.1"> <MESSAGE ID="4711" PROTOCOLVERSION="1.0"> <SIMPLERSP> <IMETHODRESPONSE NAME="EnumerateClasses"> <ERROR CODE="3" DESCRIPTION="The target namespace does not exist"/> </IMETHODRESPONSE> </SIMPLERSP> </MESSAGE> </CIM> |
|
From: Gareth S B. <bes...@us...> - 2005-05-18 04:50:15
|
Update of /cvsroot/sblim/sfcb/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10000/test Log Message: Directory /cvsroot/sblim/sfcb/test added to the repository |
|
From: Gareth S B. <bes...@us...> - 2005-05-18 04:20:00
|
Update of /cvsroot/sblim/sfcb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5034 Modified Files: installsfcb.sh Log Message: Index: installsfcb.sh =================================================================== RCS file: /cvsroot/sblim/sfcb/installsfcb.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- installsfcb.sh 18 May 2005 04:06:48 -0000 1.1 +++ installsfcb.sh 18 May 2005 04:19:51 -0000 1.2 @@ -77,33 +77,29 @@ typeset _PACKAGE=$1 if [[ -n $2 ]]; then typeset _PREFIX=$2; fi - # Check if running this from within sfcb source dir - if [[ -e sfcBroker.c ]]; then - _ANSWER="N" - else + # Check if need to download the package source + if [[ $_PACKAGE != "sfcb" || ! -e sfcBroker.c ]]; then + + # Check if rebuilding existing package _ANSWER="Y" - fi - - # Check if rebuilding existing package - if [[ -e $PWD/$_PACKAGE ]]; then - echo -n "$PWD/$_PACKAGE already exists. Rebuild and reinstall? y/[N] "; read _ANSWER - if [[ -z $_ANSWER || $_ANSWER = "N" || $_ANSWER = "n" ]]; then return 0; fi + if [[ -e $PWD/$_PACKAGE ]]; then + echo -n "$PWD/$_PACKAGE already exists. Rebuild and reinstall? y/[N] "; read _ANSWER + if [[ -z $_ANSWER || $_ANSWER = "N" || $_ANSWER = "n" ]]; then return 0; fi - echo -n "Download latest $_PACKAGE source from CVS? y/[N] "; read _ANSWER - fi + echo -n "Download latest $_PACKAGE source from CVS? y/[N] "; read _ANSWER + fi - # Check if need to download package source from CVS - if [[ $_ANSWER = "Y" || $_ANSWER = "y" ]]; then - echo "Downloading $_PACKAGE source from CVS. Please wait..." - rm -rf $_PACKAGE - cvs -z3 -d$CVSROOT -q co -P $_PACKAGE - if [[ $? -ne 0 ]]; then return 1; fi - fi + # Check if need to download package source from CVS + if [[ $_ANSWER = "Y" || $_ANSWER = "y" ]]; then + echo "Downloading $_PACKAGE source from CVS. Please wait..." + rm -rf $_PACKAGE + cvs -z3 -d$CVSROOT -q co -P $_PACKAGE + if [[ $? -ne 0 ]]; then return 1; fi + fi - if [[ ! -e sfcBroker.c ]]; then - cd $_PACKAGE + cd $_PACKAGE fi - + # Special case: if sfcb package then download mofc into it too if [[ $_PACKAGE = "sfcb" && ! -e $PWD/mofc ]]; then echo "Downloading mofc source from CVS. Please wait..." @@ -290,6 +286,7 @@ exit 1 fi +cd tests # Run some simple tests using wbemcat if which wbemcat > /dev/null; then echo "****************************************" |
|
From: Gareth S B. <bes...@us...> - 2005-05-18 04:06:58
|
Update of /cvsroot/sblim/sfcb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2831 Added Files: installsfcb.sh Log Message: Added autoinstall script for building sfcb and supporting packages --- NEW FILE: installsfcb.sh --- #!/bin/sh clear echo "This script installs the Small-Footprint CIM Broker (sfcb) and supporting" echo "packages from CVS. You will be prompted for some settings; the default response" echo "is shown in square brackets; e.g. [Y]. Press ENTER to select the default." echo echo "To log the output of this installation re-run this script using the command:" echo " sh $0 | tee /tmp/installsfcb.log" # Check if running as root if [[ $USER = "root" ]]; then echo echo "WARNING: It is not recommended to run this script as root!" echo "Please re-run this script under a regular userid; you will be prompted" echo "to enter the root password for operations that require root permission." fi # Check if we have correct versions of required packages echo echo "The following packages are required to build the sfcb packages:" echo " automake >= 1.8. Your automake version is: $(rpm -q automake)" echo " autoconf >= 2.5.8. Your autoconf version is: $(rpm -q autoconf)" echo " libtool >= 1.5.8. Your libtool version is: $(rpm -q libtool)" echo " bison >= 1.85. Your bison version is: $(rpm -q bison)" echo " curl >= 7.11.1-1. Your curl version is: $(rpm -q curl)" echo " curl-devel >= 7.11.1-1. Your curl-devel version is: $(rpm -q curl-devel)" echo "Older/missing versions of packages may cause build failures." echo echo -n "Continue with sfcb install? [Y]/n "; read _ANSWER if [[ $_ANSWER = "N" || $_ANSWER = "n" ]]; then exit 1; fi # Check if there is an existing install script anywhere that will break autoconf for _FILE in ./install-sh ./install.sh ../install-sh ../install.sh; do if [[ -e $_FILE ]]; then echo "Existing $_FILE will break autoconf! Please remove/rename it and re-run $0" exit 1 fi done # Setup CVS access unset _ANSWER if [[ -n $CVSROOT ]]; then echo "Your CVSROOT is currently set to:" echo " $CVSROOT" echo -n "Change CVSROOT to SourceForge SBLIM project anonymous access? [Y]/n "; read _ANSWER fi if [[ -z $_ANSWER || $_ANSWER = "Y" || $_ANSWER = "y" ]]; then export CVSROOT=":pserver:anonymous:@cvs.sourceforge.net:/cvsroot/sblim" fi # If using CVS pserver method then CVS login now if [[ $( echo $CVSROOT | cut -f2 -d':' ) == "pserver" ]]; then cvs login if [[ $? -ne 0 ]]; then exit 1; fi fi # Where to download and build packages _SRCROOT=$PWD echo -n "Location to download sfcb packages into? [$_SRCROOT] "; read _ANSWER if [[ -n $_ANSWER ]]; then _SRCROOT=$_ANSWER; fi mkdir -p $_SRCROOT if [[ $? -ne 0 ]]; then exit 1; fi # Where do we want to install to? The default install target is /usr/local/... export _PREFIX=/usr/local echo -n "Location prefix to install local sfcb packages under? [$_PREFIX] "; read _ANSWER if [[ -n $_ANSWER ]]; then _PREFIX=$_ANSWER; fi # ----------------------------------------------------------------------------------- # Generic function to download, configure, build and install a SBLIM package from CVS # Usage: _installpkg <PACKAGE> [PREFIX] # <PACKAGE> package CVS module name # [PREFIX] autoconf install prefix. Optional function _installpkg { typeset _PACKAGE=$1 if [[ -n $2 ]]; then typeset _PREFIX=$2; fi # Check if running this from within sfcb source dir if [[ -e sfcBroker.c ]]; then _ANSWER="N" else _ANSWER="Y" fi # Check if rebuilding existing package if [[ -e $PWD/$_PACKAGE ]]; then echo -n "$PWD/$_PACKAGE already exists. Rebuild and reinstall? y/[N] "; read _ANSWER if [[ -z $_ANSWER || $_ANSWER = "N" || $_ANSWER = "n" ]]; then return 0; fi echo -n "Download latest $_PACKAGE source from CVS? y/[N] "; read _ANSWER fi # Check if need to download package source from CVS if [[ $_ANSWER = "Y" || $_ANSWER = "y" ]]; then echo "Downloading $_PACKAGE source from CVS. Please wait..." rm -rf $_PACKAGE cvs -z3 -d$CVSROOT -q co -P $_PACKAGE if [[ $? -ne 0 ]]; then return 1; fi fi if [[ ! -e sfcBroker.c ]]; then cd $_PACKAGE fi # Special case: if sfcb package then download mofc into it too if [[ $_PACKAGE = "sfcb" && ! -e $PWD/mofc ]]; then echo "Downloading mofc source from CVS. Please wait..." cvs -z3 -d$CVSROOT -q co -P mofc if [[ $? -ne 0 ]]; then return 1; fi fi # Configure the package for building echo "Running autoconfiscate.sh ..." && sh autoconfiscate.sh && echo "Running configure ..." && sh configure --prefix=$_PREFIX CIMSERVER=sfcb && echo "Running make clean ..." && make clean if [[ $? -ne 0 ]]; then return 1; fi # WORKAROUND A BUILD PROBLEM THAT CAN HAPPEN DUE TO MISSING ./lib/.lib/ (mkdir -p .libs && cd .libs && rm -rf .libs && ln -f -s $PWD .libs && cd ..) && # Build/install the package echo "Running make ..." && make && echo -n "Running make install & postinstall. Enter Root " && su --preserve-environment --command \ "make install && (make -k postinstall || echo No postinstall. Continuing...)" # Make sure everything worked if [[ $? -ne 0 ]]; then echo "Failed to build/install $_PACKAGE" return 1 fi echo "Finished installing $_PACKAGE" return 0 } # ----------------------------------------------------------------------------------- # Remove all old stuff for clean rebuild echo -n "Remove all existing sfcb and SBLIM files under $_PREFIX/? y/[N] "; read _ANSWER if [[ $_ANSWER = "Y" || $_ANSWER = "y" ]]; then echo -n "Removing files. Enter Root " su --preserve-environment --command "rm -rf \ $_PREFIX/var/lib/sfcb* \ $_PREFIX/var/lib/sblim* \ $_PREFIX/etc/sfcb* \ $_PREFIX/etc/init.d/sfcb* \ $_PREFIX/lib/libsfc* \ $_PREFIX/lib/libcmpi* \ $_PREFIX/lib/libind_helper* \ $_PREFIX/lib/libCWS* \ $_PREFIX/lib/libTST* \ $_PREFIX/lib/libcwsutil* \ $_PREFIX/lib/libdmiinfo* \ $_PREFIX/lib/libIndTestProvider* \ $_PREFIX/lib/cmpi* \ $_PREFIX/include/sblim* \ $_PREFIX/include/cmpi* \ $_PREFIX/bin/sfcb* \ $_PREFIX/bin/wbem* \ $_PREFIX/sbin/sfcbd \ $_PREFIX/share/doc/sblim* \ $_PREFIX/share/doc/sfcb* \ $_PREFIX/share/sblim* \ $_PREFIX/share/sfcb*" fi # Download, build and install the sfcb package cd $_SRCROOT _installpkg "sfcb" $_PREFIX if [[ $? -ne 0 ]]; then exit 1; fi # Add sfcb locations to the search paths export PATH=$_PREFIX/bin:$PATH export LD_LIBRARY_PATH=$_PREFIX/lib:$LD_LIBRARY_PATH # Setup sfcb tracing export SFCB_TRACE_FILE=/tmp/sfcb.log rm -f $SFCB_TRACE_FILE touch $SFCB_TRACE_FILE export SFCB_TRACE=65535 # Start up the sfcbd, albeit without any namespaces or registered classes echo -n "Starting sfcb. Enter Root " su --preserve-environment --command "killall -q -9 sfcbd; sleep 1; $_PREFIX/etc/init.d/sfcb start" echo sleep 1 if ! ps -C sfcbd > /dev/null; then echo "sfcb failed to start" exit 1 fi # Run a quick test to make sure the sfcb is running and responding to client requests cd $_SRCROOT #cd $_SRCROOT/sfcb/test _TEST=enumerateclasses.FIRSTTIME echo "Running test $_TEST ..." $_PREFIX/bin/wbemcat $_TEST.xml > $_TEST.result if ! diff --brief $_TEST.result $_TEST.OK; then echo "Test failed. Check $PWD/$_TEST.result for errors" echo "(this test will fail if you reinstall sfcb with the old class repository)" echo -n "Continue with install? y/[N] "; read _ANSWER if [[ -z $_ANSWER || $_ANSWER = "N" || $_ANSWER = "n" ]]; then exit 1; fi else echo "Test succeeded." rm -f $_TEST.result fi echo "-------------------------------------------------------------------------------" echo "The Small-Footprint CIM Broker (sfcb) is successfully installed and running." echo "You may now download and install additional SBLIM packages." # Download, build and install the wbemcli client echo "-------------------------------------------------------------------------------" echo -n "Do you want to install the SBLIM wbemcli CIM client? [Y]/n "; read _ANSWER if [[ -z $_ANSWER || $_ANSWER = "Y" || $_ANSWER = "y" ]]; then cd $_SRCROOT _installpkg "wbemcli" $_PREFIX fi # Download, build and install SBLIM provider packages & development tools to ./sblim subdirectory cd $_SRCROOT mkdir -p sblim # Download, build and install the SBLIM development tools echo "-------------------------------------------------------------------------------" echo -n "Do you want to install the SBLIM development tools? [Y]/n "; read _ANSWER if [[ -z $_ANSWER || $_ANSWER = "Y" || $_ANSWER = "y" ]]; then _PACKAGES="cmpi-devel indication_helper testsuite" for _PACKAGE in $_PACKAGES; do cd $_SRCROOT/sblim _installpkg $_PACKAGE $_PREFIX done fi # Download, build and install the CMPI base instrumentation echo "-------------------------------------------------------------------------------" echo -n "Do you want to install the SBLIM base CMPI instrumention? [Y]/n "; read _ANSWER if [[ -z $_ANSWER || $_ANSWER = "Y" || $_ANSWER = "y" ]]; then cd $_SRCROOT/sblim _installpkg "cmpi-base" $_PREFIX fi # Download, build and install the sample CMPI providers echo "-------------------------------------------------------------------------------" echo -n "Do you want to install the SBLIM sample CMPI providers? [Y]/n "; read _ANSWER if [[ -z $_ANSWER || $_ANSWER="Y" || $_ANSWER="y" ]]; then _PACKAGES="cmpi-fad cmpi-processes cmpi-authorization cmpi-instancelist" for _PACKAGE in $_PACKAGES; do cd $_SRCROOT/sblim _installpkg cmpi-samples/$_PACKAGE $_PREFIX done fi # Download, build and install the test CMPI providers echo "-------------------------------------------------------------------------------" echo -n "Do you want to install the SBLIM test CMPI providers? [Y]/n "; read _ANSWER if [[ -z $_ANSWER || $_ANSWER = "Y" || $_ANSWER = "y" ]]; then # _PACKAGES="cmpi-instancetest cmpi-associationtest cmpi-methodtest cmpi-indicationtest cmpi-reef" _PACKAGES="cmpi-instancetest cmpi-methodtest cmpi-reef" for _PACKAGE in $_PACKAGES; do cd $_SRCROOT/sblim _installpkg cmpi-tests/$_PACKAGE $_PREFIX done fi # Add SBLIM provider library location to search path export LD_LIBRARY_PATH=$_PREFIX/lib/cmpi:$LD_LIBRARY_PATH # BUILD PROBLEM WORKAROUND NEEDED FOR SOME PACKAGES WHEN LIBS DONT GET LINKED CORRECTLY echo "Workaround for missing <lib>.0 symbolic links" su -p -c 'for _LIB in $( find $_PREFIX/lib -name "lib*.0.0.0" ); do _NEWLIB=${_LIB%.0.0} if [[ ! -e $_NEWLIB ]]; then ln -s $_LIB $_NEWLIB; fi done' # Restart sfcb echo "-------------------------------------------------------------------------------" echo -n "Restarting sfcbd. Enter Root " su --preserve-environment --command "$_PREFIX/etc/init.d/sfcb restart" echo sleep 1 if ! ps -C sfcbd > /dev/null; then echo "sfcb failed to start" exit 1 fi # Run some simple tests using wbemcat if which wbemcat > /dev/null; then echo "****************************************" _CMD="wbemcat $PWD/enumerateclasses.ALL.xml" echo -e "wbemcat test: EnumerateClasses on root/cimv2 namespace ...\n\t$_CMD" eval $_CMD echo "****************************************" _CMD="wbemcat $PWD/getclass.Linux_OperatingSystem.xml" echo -e "wbemcat test: GetClass on Linux_OperatingSystem class ...\n\t$_CMD" eval $_CMD echo "****************************************" _CMD="wbemcat $PWD/enumerateinstancenames.Linux_OperatingSystem.xml" echo -e "wbemcat test: EnumerateInstanceNames on Linux_OperatingSystem class ...\n\t$_CMD" eval $_CMD echo "****************************************" _CMD="wbemcat $PWD/enumerateinstances.Linux_OperatingSystem.xml" echo -e "wbemcat test: EnumerateInstances on Linux_OperatingSystem class ...\n\t$_CMD" eval $_CMD fi # Run some simple tests using wbemcli if which wbemcli > /dev/null; then echo "****************************************" _CMD="wbemcli ec 'http://localhost:5988/root/cimv2'" echo -e "wbemcli test: EnumerateClasses on root/cimv2 namespace ...\n\t$_CMD" eval $_CMD echo "****************************************" _CMD="wbemcli gc 'http://localhost:5988/root/cimv2:Linux_OperatingSystem'" echo -e "wbemcli test: GetClass on Linux_OperatingSystem class ...\n\t$_CMD" eval $_CMD echo "****************************************" _CMD="wbemcli ein 'http://localhost:5988/root/cimv2:Linux_OperatingSystem'" echo -e "wbemcli test: EnumerateInstanceNames on Linux_OperatingSystem class ...\n\t$_CMD" eval $_CMD echo "****************************************" _CMD="wbemcli -nl ei 'http://localhost:5988/root/cimv2:Linux_OperatingSystem'" echo -e "wbemcli test: EnumerateInstances on Linux_OperatingSystem class ...\n\t$_CMD" eval $_CMD fi exit 0 sfcbrepos -f mkdir -p $_PREFIX/var/lib/sfcb/registration/repository/root/interop rm -rf $_PREFIX/var/lib/sfcb/registration/repository/root/interop/* sfcbmof -I $_PREFIX/share/sfcb/CIM -i CIM_Schema.mof -o $_PREFIX/var/lib/sfcb/registration/repository/root/interop/classSchemas ./interop.mof sfcbd -tm ? exit 0 |
|
From: Adrian S. <a3s...@us...> - 2005-05-17 23:36:34
|
Update of /cvsroot/sblim/sfcb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23064 Modified Files: datetime.c Log Message: Fixed [ 1197062 ] CMGetBinaryFormat(dateTime) different for same date (?) Problem caused by rounding problems. All temporaries and constants used for string to bin and vice versa redefined as unsigned long long. Index: datetime.c =================================================================== RCS file: /cvsroot/sblim/sfcb/datetime.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- datetime.c 9 Mar 2005 12:25:11 -0000 1.1.1.1 +++ datetime.c 17 May 2005 23:36:14 -0000 1.2 @@ -131,23 +131,25 @@ { struct native_datetime *ndt = (struct native_datetime *) dt; - time_t secs = ndt->msecs / 1000000; - unsigned long usecs = ndt->msecs % 1000000; + time_t secs = ndt->msecs / 1000000ULL; + unsigned long usecs = ndt->msecs % 1000000ULL; if (ndt->interval) { - unsigned long mins, hrs, days; - - mins = secs / 60; - secs %= 60; - hrs = mins / 60; - mins %= 60; - days = hrs / 24; - hrs %= 24; + unsigned long long useconds, seconds, mins, hrs, days; + seconds= ndt->msecs / 1000000ULL; + useconds = ndt->msecs % 1000000ULL; - sprintf(str_time, "%8.8ld%2.2ld%2.2ld%2.2ld.%6.6ld:000", - days, hrs, mins, secs, usecs); + mins = seconds / 60ULL; + seconds %= 60ULL; + hrs = mins / 60ULL; + mins %= 60ULL; + days = hrs / 24ULL; + hrs %= 24ULL; + sprintf(str_time, "%8.8llu%2.2llu%2.2llu%2.2llu.%6.6llu:000", + days, hrs, mins, seconds, useconds); +// fprintf(stderr,"Interval: %s\n",str_time); } else { @@ -169,6 +171,7 @@ strftime(str_time, 26, "%Y%m%d%H%M%S.", &tm_time); strcat(str_time, us_utc_time); +// fprintf(stderr,"DateTime: %s\n",str_time); } } @@ -302,7 +305,8 @@ - for time intervals: ddddddddhhmmss.mmmmmm:000 \param string the time to be converted into internal representation - \param rc return code pointer + \param rc return code pointer #include <limits.h> + \return a pointer to a native CMPIDateTime. @@ -311,23 +315,36 @@ CMPIDateTime *native_new_CMPIDateTime_fromChars(const char *string, CMPIStatus * rc) { - CMPIUint64 msecs; + CMPIUint64 msecs,secs; CMPIBoolean interval = (string[21] == ':'); char *str = strdup(string); - + +// 0000000000111111111122222 +// 0123456789012345678901234 +// yyyymmddhhmmss mmmmmmsutc +// 20050503104354.000000:000 + +// fprintf(stderr,"string: %s\n",str); str[21] = 0; - msecs = atoll(str + 15); + msecs = strtoull(str+15,NULL,10); +// fprintf(stderr,"micros: %s %llu\n",str+15,msecs); + str[14] = 0; - msecs += atoll(str + 12) * 1000000; + secs = strtoull(str+12,NULL,10); +// fprintf(stderr,"secnds: %s %llu\n",str+12,secs); str[12] = 0; - msecs += atoll(str + 10) * 1000000 * 60; + secs += strtoull(str+10,NULL,10) * 60ULL; +// fprintf(stderr,"minuts: %s %llu\n",str+10,secs); str[10] = 0; - msecs += atoll(str + 8) * 1000000 * 60 * 60; + secs += strtoull(str+8,NULL,10) * 60ULL * 60ULL; +// fprintf(stderr,"hours : %s %llu\n",str+8,secs); str[8] = 0; if (interval) { - msecs += atoll(str) * 1000000 * 60 * 60 * 24; + secs += strtoull(str,NULL,10) * 60ULL * 60ULL * 24ULL; + msecs=msecs+(secs*1000000ULL); +// fprintf(stderr,"intrvl: %s %llu %llu\n",str,msecs,secs); } else { @@ -344,7 +361,9 @@ str[4] = 0; tmp.tm_year = atoi(str) - 1900; - msecs += (CMPIUint64) mktime(&tmp) * 1000000; + msecs=msecs+(secs*1000000ULL); + msecs += (CMPIUint64) mktime(&tmp) * 1000000ULL; +// fprintf(stderr,"mktime: %d %d %d %llu\n",tmp.tm_year,tmp.tm_mon,tmp.tm_mday,msecs); } free(str); |
|
From: Gareth S B. <bes...@us...> - 2005-05-17 18:07:22
|
Update of /cvsroot/sblim/cmpi-base In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15475 Modified Files: cmpiOSBase_OperatingSystemProvider.c Log Message: fixed spelling of IND_BEHAVIOUR_LEVEL_EDGE Index: cmpiOSBase_OperatingSystemProvider.c =================================================================== RCS file: /cvsroot/sblim/cmpi-base/cmpiOSBase_OperatingSystemProvider.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- cmpiOSBase_OperatingSystemProvider.c 11 May 2005 14:00:44 -0000 1.15 +++ cmpiOSBase_OperatingSystemProvider.c 17 May 2005 18:06:54 -0000 1.16 @@ -534,7 +534,7 @@ "Poll function", check, 10, - IND_BEHAVIOUR_LEVEL_EDGE) != IND_OK) { + IND_BEHAVIOR_LEVEL_EDGE) != IND_OK) { _OSBASE_TRACE(1,("--- %s ind_init() failed: register poll function",_ClassName)); CMRelease(sourceInstance); return; |
|
From: Konrad R. <kon...@us...> - 2005-05-17 17:20:42
|
Update of /cvsroot/sblim/indication_helper/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4581/test Modified Files: Test_addProperty.c Test_all_functions.c Test_genIndication.c Test_genIndication_fail.c Test_reg_pollfnc.c Test_reg_pollfnc2.c Test_reg_pollfnc3.c Test_reg_pollfnc3_threaded.c Log Message: BUG#: 1199129 ( Providers won't compile with CMPI 1.0) Porting ind_helper library to CMPI 1.00 spec. Changing spelling of BEHAVIOUR to BEHAVIOR Index: Test_reg_pollfnc2.c =================================================================== RCS file: /cvsroot/sblim/indication_helper/test/Test_reg_pollfnc2.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Test_reg_pollfnc2.c 19 Apr 2005 16:04:24 -0000 1.2 +++ Test_reg_pollfnc2.c 17 May 2005 17:20:31 -0000 1.3 @@ -21,15 +21,19 @@ #include <unistd.h> #include <stdlib.h> +#ifdef CMPI_VER_100 +#define CONST const +#else +#define CONST +#endif int test1_values = 0; int debug = 0; CMPIStatus good = {CMPI_RC_OK, NULL}; CMPIContext context; - -CMPIContext* _fake_prepareAttachThread(CMPIBroker* b, CMPIContext* ctx); -CMPIStatus _fake_attachThread (CMPIBroker*b, CMPIContext*c); -CMPIStatus _fake_detachThread (CMPIBroker* mb, CMPIContext* ctx); +CMPIContext* _fake_prepareAttachThread(CONST CMPIBroker* b, CONST CMPIContext* ctx); +CMPIStatus _fake_attachThread (CONST CMPIBroker*b, CONST CMPIContext*c); +CMPIStatus _fake_detachThread (CONST CMPIBroker* mb, CONST CMPIContext* ctx); IndErrorT test1(CMPIData *v); IndErrorT test2(CMPIData *v); @@ -51,17 +55,17 @@ fprintf(stderr,"test2 called\n"); return IND_OK; } -CMPIContext* _fake_prepareAttachThread(CMPIBroker* b, CMPIContext* ctx) +CMPIContext* _fake_prepareAttachThread(CONST CMPIBroker* b, CONST CMPIContext* ctx) { return &context; } -CMPIStatus _fake_attachThread (CMPIBroker*b, CMPIContext*c) +CMPIStatus _fake_attachThread (CONST CMPIBroker*b, CONST CMPIContext*c) { return good; } -CMPIStatus _fake_detachThread (CMPIBroker* mb, CMPIContext* ctx) +CMPIStatus _fake_detachThread (CONST CMPIBroker* mb, CONST CMPIContext* ctx) { return good;; } @@ -87,9 +91,9 @@ assert ( ind_reg(&b, &ctx) == IND_OK); /* Register the test function */ - assert ( ind_reg_pollfnc("test1", "A", test1, 1,IND_BEHAVIOUR_LEVEL_EDGE) == IND_OK); - assert ( ind_reg_pollfnc("test1", "B", test2, 1,IND_BEHAVIOUR_LEVEL_EDGE) == IND_OK); - assert ( ind_reg_pollfnc("test1", "C", test2, 1,IND_BEHAVIOUR_LEVEL_EDGE) == IND_OK); + assert ( ind_reg_pollfnc("test1", "A", test1, 1,IND_BEHAVIOR_LEVEL_EDGE) == IND_OK); + assert ( ind_reg_pollfnc("test1", "B", test2, 1,IND_BEHAVIOR_LEVEL_EDGE) == IND_OK); + assert ( ind_reg_pollfnc("test1", "C", test2, 1,IND_BEHAVIOR_LEVEL_EDGE) == IND_OK); assert ( test1_values == 1 ); Index: Test_reg_pollfnc.c =================================================================== RCS file: /cvsroot/sblim/indication_helper/test/Test_reg_pollfnc.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Test_reg_pollfnc.c 19 Apr 2005 16:04:23 -0000 1.2 +++ Test_reg_pollfnc.c 17 May 2005 17:20:31 -0000 1.3 @@ -22,6 +22,12 @@ #include <stdlib.h> #include <unistd.h> +#ifdef CMPI_VER_100 +#define CONST const +#else +#define CONST +#endif + static CMPIBroker b; static CMPIContext ctx; static int debug = 0; @@ -42,13 +48,14 @@ IndErrorT test_char(CMPIData *v); IndErrorT test_string(CMPIData *v); -char * _fake_getCharPtrString (CMPIString* st, CMPIStatus* rc); + +char * _fake_getCharPtrString (CONST CMPIString* st, CMPIStatus* rc); CMPIStatus _fake_releaseString (CMPIString* st) ; -CMPIString* _fake_cloneString(CMPIString* st, CMPIStatus* rc); -CMPIString* _fake_newString (CMPIBroker* mb, const char *data, CMPIStatus* rc); -CMPIContext* _fake_prepareAttachThread(CMPIBroker* mb, CMPIContext* ctx); -CMPIStatus _fake_attachThread (CMPIBroker*b, CMPIContext*c); -CMPIStatus _fake_detachThread (CMPIBroker* mb, CMPIContext* ctx); +CMPIString* _fake_cloneString(CONST CMPIString* st, CMPIStatus* rc); +CMPIString* _fake_newString (CONST CMPIBroker* mb, const char *data, CMPIStatus* rc); +CMPIContext* _fake_prepareAttachThread(CONST CMPIBroker* mb, CONST CMPIContext* ctx); +CMPIStatus _fake_attachThread (CONST CMPIBroker*b, CONST CMPIContext*c); +CMPIStatus _fake_detachThread (CONST CMPIBroker* mb, CONST CMPIContext* ctx); /* Test routines */ IndErrorT test_uint16(CMPIData *v) @@ -184,7 +191,7 @@ /* Fake CMPI functions. They were written so we don't have to depend on a CMPI broker and can use our own. */ -char * _fake_getCharPtrString (CMPIString* st, CMPIStatus* rc) +char * _fake_getCharPtrString (CONST CMPIString* st, CMPIStatus* rc) { if (debug) fprintf(stderr,"_fake_getCharPtrString: %p\n", st); @@ -207,7 +214,7 @@ return status; } -CMPIString* _fake_cloneString(CMPIString* st, CMPIStatus* rc) +CMPIString* _fake_cloneString(CONST CMPIString* st, CMPIStatus* rc) { CMPIString *s = (CMPIString *)malloc( sizeof(CMPIString)); @@ -231,7 +238,7 @@ -CMPIString* _fake_newString (CMPIBroker* mb, const char *data, CMPIStatus* rc) +CMPIString* _fake_newString (CONST CMPIBroker* mb, const char *data, CMPIStatus* rc) { CMPIString *s = (CMPIString *)malloc(sizeof(CMPIString)); @@ -252,21 +259,21 @@ CMPIContext context; CMPIStatus good = {CMPI_RC_OK, NULL}; -CMPIContext* _fake_prepareAttachThread(CMPIBroker* mb, CMPIContext* ctx) +CMPIContext* _fake_prepareAttachThread(CONST CMPIBroker* mb, CONST CMPIContext* ctx) { if (debug) fprintf(stderr,"_fake_prepareAttachThread called.\n"); return &context; } -CMPIStatus _fake_attachThread (CMPIBroker*b, CMPIContext*c) +CMPIStatus _fake_attachThread (CONST CMPIBroker*b, CONST CMPIContext*c) { if (debug) fprintf(stderr,"_fake_attachThread called.\n"); return good; } -CMPIStatus _fake_detachThread (CMPIBroker* mb, CMPIContext* ctx) +CMPIStatus _fake_detachThread (CONST CMPIBroker* mb, CONST CMPIContext* ctx) { if (debug) fprintf(stderr,"_fake_detachThread called.\n"); @@ -305,27 +312,27 @@ assert ( ind_reg(&b, &ctx) == IND_OK); /* Register functions with data types */ - assert ( ind_reg_pollfnc("test4", "uint16", test_uint16, 1, IND_BEHAVIOUR_LEVEL_EDGE) == IND_OK); + assert ( ind_reg_pollfnc("test4", "uint16", test_uint16, 1, IND_BEHAVIOR_LEVEL_EDGE) == IND_OK); - assert ( ind_reg_pollfnc("test4", "char", test_char, 1, IND_BEHAVIOUR_LEVEL_EDGE) == IND_OK); + assert ( ind_reg_pollfnc("test4", "char", test_char, 1, IND_BEHAVIOR_LEVEL_EDGE) == IND_OK); - assert ( ind_reg_pollfnc("test4" ,"string", test_string, 1, IND_BEHAVIOUR_LEVEL_EDGE) == IND_OK); + assert ( ind_reg_pollfnc("test4" ,"string", test_string, 1, IND_BEHAVIOR_LEVEL_EDGE) == IND_OK); - assert ( ind_reg_pollfnc("test4" ,"uint64", test_uint64, 1, IND_BEHAVIOUR_LEVEL_EDGE) == IND_OK); - assert ( ind_reg_pollfnc("test4" ,"uint32", test_uint32, 1, IND_BEHAVIOUR_LEVEL_EDGE) == IND_OK); - assert ( ind_reg_pollfnc("test4" ,"uint8", test_uint8, 1, IND_BEHAVIOUR_LEVEL_EDGE) == IND_OK); - assert ( ind_reg_pollfnc("test4" ,"sint64", test_sint64, 1, IND_BEHAVIOUR_LEVEL_EDGE) == IND_OK); - assert ( ind_reg_pollfnc("test4" ,"sint32", test_sint32, 1, IND_BEHAVIOUR_LEVEL_EDGE) == IND_OK); - assert ( ind_reg_pollfnc("test4" ,"sint16", test_sint16, 1, IND_BEHAVIOUR_LEVEL_EDGE) == IND_OK); - assert ( ind_reg_pollfnc("test4" ,"sint8", test_sint8, 1, IND_BEHAVIOUR_LEVEL_EDGE) == IND_OK); + assert ( ind_reg_pollfnc("test4" ,"uint64", test_uint64, 1, IND_BEHAVIOR_LEVEL_EDGE) == IND_OK); + assert ( ind_reg_pollfnc("test4" ,"uint32", test_uint32, 1, IND_BEHAVIOR_LEVEL_EDGE) == IND_OK); + assert ( ind_reg_pollfnc("test4" ,"uint8", test_uint8, 1, IND_BEHAVIOR_LEVEL_EDGE) == IND_OK); + assert ( ind_reg_pollfnc("test4" ,"sint64", test_sint64, 1, IND_BEHAVIOR_LEVEL_EDGE) == IND_OK); + assert ( ind_reg_pollfnc("test4" ,"sint32", test_sint32, 1, IND_BEHAVIOR_LEVEL_EDGE) == IND_OK); + assert ( ind_reg_pollfnc("test4" ,"sint16", test_sint16, 1, IND_BEHAVIOR_LEVEL_EDGE) == IND_OK); + assert ( ind_reg_pollfnc("test4" ,"sint8", test_sint8, 1, IND_BEHAVIOR_LEVEL_EDGE) == IND_OK); - assert ( ind_reg_pollfnc("test4" ,"real32", test_real32, 1, IND_BEHAVIOUR_LEVEL_EDGE) == IND_OK); - assert ( ind_reg_pollfnc("test4" ,"real64", test_real64, 1, IND_BEHAVIOUR_LEVEL_EDGE) == IND_OK); + assert ( ind_reg_pollfnc("test4" ,"real32", test_real32, 1, IND_BEHAVIOR_LEVEL_EDGE) == IND_OK); + assert ( ind_reg_pollfnc("test4" ,"real64", test_real64, 1, IND_BEHAVIOR_LEVEL_EDGE) == IND_OK); - assert ( ind_reg_pollfnc("test4" ,"boolean", test_boolean, 1, IND_BEHAVIOUR_LEVEL_EDGE) == IND_OK); - assert ( ind_reg_pollfnc("test4" ,"char16", test_char16, 1, IND_BEHAVIOUR_LEVEL_EDGE) == IND_OK); + assert ( ind_reg_pollfnc("test4" ,"boolean", test_boolean, 1, IND_BEHAVIOR_LEVEL_EDGE) == IND_OK); + assert ( ind_reg_pollfnc("test4" ,"char16", test_char16, 1, IND_BEHAVIOR_LEVEL_EDGE) == IND_OK); - assert ( ind_reg_pollfnc("test4" ,"ptr", test_ptr, 1, IND_BEHAVIOUR_LEVEL_EDGE) == IND_OK); + assert ( ind_reg_pollfnc("test4" ,"ptr", test_ptr, 1, IND_BEHAVIOR_LEVEL_EDGE) == IND_OK); assert ( ind_start() == IND_OK); Index: Test_addProperty.c =================================================================== RCS file: /cvsroot/sblim/indication_helper/test/Test_addProperty.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Test_addProperty.c 19 Apr 2005 16:04:16 -0000 1.2 +++ Test_addProperty.c 17 May 2005 17:20:31 -0000 1.3 @@ -51,8 +51,8 @@ debug =1; /* Register functions with data types */ - assert ( ind_reg_pollfnc("test5", "test_BAD", test_BAD, 10, IND_BEHAVIOUR_LEVEL_EDGE) == -100); - assert ( ind_reg_pollfnc("test5", "test_BAD2", test_BAD2, 10, IND_BEHAVIOUR_LEVEL_EDGE) == IND_OK); + assert ( ind_reg_pollfnc("test5", "test_BAD", test_BAD, 10, IND_BEHAVIOR_LEVEL_EDGE) == -100); + assert ( ind_reg_pollfnc("test5", "test_BAD2", test_BAD2, 10, IND_BEHAVIOR_LEVEL_EDGE) == IND_OK); assert ( ind_shutdown() == IND_OK); Index: Test_all_functions.c =================================================================== RCS file: /cvsroot/sblim/indication_helper/test/Test_all_functions.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Test_all_functions.c 19 Apr 2005 16:04:23 -0000 1.2 +++ Test_all_functions.c 17 May 2005 17:20:31 -0000 1.3 @@ -37,8 +37,8 @@ assert ( IND_OK == ind_shutdown()); /* Monitored */ - assert ( IND_INVALID_ARGS == ind_reg_pollfnc("","",NULL, 0,IND_BEHAVIOUR_LEVEL_EDGE )); - assert ( IND_INVALID_ARGS == ind_reg_pollfnc_ns("","","",NULL, 0, IND_BEHAVIOUR_AGAINST_ZERO)); + assert ( IND_INVALID_ARGS == ind_reg_pollfnc("","",NULL, 0,IND_BEHAVIOR_LEVEL_EDGE )); + assert ( IND_INVALID_ARGS == ind_reg_pollfnc_ns("","","",NULL, 0, IND_BEHAVIOR_AGAINST_ZERO)); assert ( IND_INVALID_ARGS == ind_unreg_pollfnc("","")); assert ( IND_INVALID_ARGS == ind_unreg_pollfnc_ns("","","")); Index: Test_reg_pollfnc3_threaded.c =================================================================== RCS file: /cvsroot/sblim/indication_helper/test/Test_reg_pollfnc3_threaded.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Test_reg_pollfnc3_threaded.c 19 Apr 2005 16:04:24 -0000 1.2 +++ Test_reg_pollfnc3_threaded.c 17 May 2005 17:20:31 -0000 1.3 @@ -56,7 +56,7 @@ { snprintf(pn, 100,"A%d", i); - if (ind_reg_pollfnc("test1", pn, test1, 1,IND_BEHAVIOUR_LEVEL_EDGE) == IND_MUTEX) { + if (ind_reg_pollfnc("test1", pn, test1, 1,IND_BEHAVIOR_LEVEL_EDGE) == IND_MUTEX) { rc = IND_MUTEX; return NULL; } Index: Test_genIndication_fail.c =================================================================== RCS file: /cvsroot/sblim/indication_helper/test/Test_genIndication_fail.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Test_genIndication_fail.c 19 Apr 2005 16:04:23 -0000 1.2 +++ Test_genIndication_fail.c 17 May 2005 17:20:31 -0000 1.3 @@ -21,31 +21,38 @@ #include <stdlib.h> #include <unistd.h> #include <string.h> + +#ifdef CMPI_VER_100 +#define CONST const +#else +#define CONST +#endif + IndErrorT test_uint16(CMPIData *v); IndErrorT test_string(CMPIData *v); IndErrorT get_value(CMPIData *v); -CMPIContext* _fake_prepareAttachThread(CMPIBroker* b, CMPIContext* ctx);; -CMPIStatus _fake_attachThread (CMPIBroker*b, CMPIContext*c);; -CMPIStatus _fake_detachThread (CMPIBroker* mb, CMPIContext* ctx);; -CMPIContext* _fake_prepareAttachThread(CMPIBroker* b, CMPIContext* ctx); -CMPIStatus _fake_attachThread (CMPIBroker*b, CMPIContext*c); -CMPIStatus _fake_detachThread (CMPIBroker* mb, CMPIContext* ctx); -char * _fake_getCharPtrString (CMPIString* st, CMPIStatus* rc); +CMPIContext* _fake_prepareAttachThread(CONST CMPIBroker* b, CONST CMPIContext* ctx);; +CMPIStatus _fake_attachThread (CONST CMPIBroker*b, CONST CMPIContext*c);; +CMPIStatus _fake_detachThread (CONST CMPIBroker* mb, CONST CMPIContext* ctx);; +CMPIContext* _fake_prepareAttachThread(CONST CMPIBroker* b, CONST CMPIContext* ctx); +CMPIStatus _fake_attachThread (CONST CMPIBroker*b, CONST CMPIContext*c); +CMPIStatus _fake_detachThread (CONST CMPIBroker* mb, CONST CMPIContext* ctx); +char * _fake_getCharPtrString (CONST CMPIString* st, CMPIStatus* rc); CMPIStatus _fake_releaseString (CMPIString* st) ; -CMPIString* _fake_cloneString(CMPIString* st, CMPIStatus* rc); -CMPIString* _fake_newString (CMPIBroker* mb, const char *data, CMPIStatus* rc); +CMPIString* _fake_cloneString(CONST CMPIString* st, CMPIStatus* rc); +CMPIString* _fake_newString (CONST CMPIBroker* mb, const char *data, CMPIStatus* rc); CMPIStatus _fake_release_ObjectPath (CMPIObjectPath* op); -CMPIObjectPath* _fake_clone_ObjectPath (CMPIObjectPath* op, CMPIStatus* rc); -CMPIObjectPath* _fake_newObjectPath (CMPIBroker* mb, const char *ns, const char *cn, CMPIStatus* rc); +CMPIObjectPath* _fake_clone_ObjectPath (CONST CMPIObjectPath* op, CMPIStatus* rc); +CMPIObjectPath* _fake_newObjectPath (CONST CMPIBroker* mb, const char *ns, const char *cn, CMPIStatus* rc); CMPIStatus _fake_release_Instance (CMPIInstance* inst); -CMPIStatus _fake_setProperty_Instance (CMPIInstance* inst, const char *name, CMPIValue* value, CMPIType type); +CMPIStatus _fake_setProperty_Instance (CONST CMPIInstance* inst, const char *name, CONST CMPIValue* value, CMPIType type); -CMPIInstance* _fake_clone_Instance (CMPIInstance* inst, CMPIStatus* rc); -CMPIInstance* _fake_newInstance (CMPIBroker* mb,CMPIObjectPath* op,CMPIStatus* rc); -CMPIStatus _fake_deliverIndication (CMPIBroker* mb, CMPIContext* ctx, const char *ns, CMPIInstance* ind); -CMPIContext* _fake_prepareAttachThread(CMPIBroker* mb, CMPIContext* ctx); -CMPIStatus _fake_attachThread (CMPIBroker*b, CMPIContext*c); -CMPIStatus _fake_detachThread (CMPIBroker* mb, CMPIContext* ctx); +CMPIInstance* _fake_clone_Instance (CONST CMPIInstance* inst, CMPIStatus* rc); +CMPIInstance* _fake_newInstance (CONST CMPIBroker* mb,CONST CMPIObjectPath* op,CMPIStatus* rc); +CMPIStatus _fake_deliverIndication (CONST CMPIBroker* mb, CONST CMPIContext* ctx, const char *ns, CONST CMPIInstance* ind); +CMPIContext* _fake_prepareAttachThread(CONST CMPIBroker* mb, CONST CMPIContext* ctx); +CMPIStatus _fake_attachThread (CONST CMPIBroker*b, CONST CMPIContext*c); +CMPIStatus _fake_detachThread (CONST CMPIBroker* mb, CONST CMPIContext* ctx); static CMPIBroker b; @@ -116,7 +123,7 @@ CMPIStatus bad = {CMPI_RC_ERROR, NULL}; /* Fake CMPIString handlers */ -char * _fake_getCharPtrString (CMPIString* st, CMPIStatus* rc) +char * _fake_getCharPtrString (CONST CMPIString* st, CMPIStatus* rc) { /* if (debug) @@ -139,7 +146,7 @@ return good; } -CMPIString* _fake_cloneString(CMPIString* st, CMPIStatus* rc) +CMPIString* _fake_cloneString(CONST CMPIString* st, CMPIStatus* rc) { CMPIString *s = (CMPIString *)malloc( sizeof(CMPIString)); @@ -163,7 +170,7 @@ return s; } -CMPIString* _fake_newString (CMPIBroker* mb, const char *data, CMPIStatus* rc) +CMPIString* _fake_newString (CONST CMPIBroker* mb, const char *data, CMPIStatus* rc) { CMPIString *s = (CMPIString *)malloc(sizeof(CMPIString)); @@ -210,7 +217,7 @@ return good; } -CMPIObjectPath* _fake_clone_ObjectPath (CMPIObjectPath* op, CMPIStatus* rc) +CMPIObjectPath* _fake_clone_ObjectPath (CONST CMPIObjectPath* op, CMPIStatus* rc) { CMPIObjectPath *objpath; _objPath *objPathData, *old; @@ -237,7 +244,7 @@ return objpath; } -CMPIObjectPath* _fake_newObjectPath (CMPIBroker* mb, const char *ns, const char *cn, CMPIStatus* rc) +CMPIObjectPath* _fake_newObjectPath (CONST CMPIBroker* mb, const char *ns, const char *cn, CMPIStatus* rc) { CMPIObjectPath *objpath; _objPath *objPathData; @@ -325,7 +332,7 @@ free(inst); return good; } -CMPIStatus _fake_setProperty_Instance (CMPIInstance* inst, const char *name, CMPIValue* value, CMPIType type) +CMPIStatus _fake_setProperty_Instance (CONST CMPIInstance* inst, const char *name, CONST CMPIValue* value, CMPIType type) { /* No checking to see if the value exist */ _instance *last,*p; @@ -369,7 +376,7 @@ return good; } -CMPIInstance* _fake_clone_Instance (CMPIInstance* inst, CMPIStatus* rc) +CMPIInstance* _fake_clone_Instance (CONST CMPIInstance* inst, CMPIStatus* rc) { CMPIInstance *instance; _instance *_inst, *_old, *p, *q; @@ -424,7 +431,7 @@ } -CMPIInstance* _fake_newInstance (CMPIBroker* mb,CMPIObjectPath* op,CMPIStatus* rc) +CMPIInstance* _fake_newInstance (CONST CMPIBroker* mb,CONST CMPIObjectPath* op,CMPIStatus* rc) { CMPIInstance *inst; _instance *instance; @@ -454,7 +461,7 @@ /* Fake deliver indication */ -CMPIStatus _fake_deliverIndication (CMPIBroker* mb, CMPIContext* ctx, const char *ns, CMPIInstance* ind) +CMPIStatus _fake_deliverIndication (CONST CMPIBroker* mb, CONST CMPIContext* ctx, const char *ns, CONST CMPIInstance* ind) { _instance *inst, *p; CMPIObjectPath *objPath; @@ -484,21 +491,21 @@ } -CMPIContext* _fake_prepareAttachThread(CMPIBroker* mb, CMPIContext* ctx) +CMPIContext* _fake_prepareAttachThread(CONST CMPIBroker* mb, CONST CMPIContext* ctx) { if (debug) fprintf(stderr,"_fake_prepareAttachThread called.\n"); return &context; } -CMPIStatus _fake_attachThread (CMPIBroker*b, CMPIContext*c) +CMPIStatus _fake_attachThread (CONST CMPIBroker*b, CONST CMPIContext*c) { if (debug) fprintf(stderr,"_fake_attachThread called.\n"); return good; } -CMPIStatus _fake_detachThread (CMPIBroker* mb, CMPIContext* ctx) +CMPIStatus _fake_detachThread (CONST CMPIBroker* mb, CONST CMPIContext* ctx) { if (debug) fprintf(stderr,"_fake_detachThread called.\n"); @@ -541,9 +548,9 @@ assert ( ind_reg(&b, &ctx) == IND_OK); /* Register functions with data types */ - assert ( ind_reg_pollfnc_ns(NAMESPACE,"test9-poll", "uint16", test_uint16, 1,IND_BEHAVIOUR_AGAINST_ZERO) == IND_OK); + assert ( ind_reg_pollfnc_ns(NAMESPACE,"test9-poll", "uint16", test_uint16, 1,IND_BEHAVIOR_AGAINST_ZERO) == IND_OK); - assert ( ind_reg_pollfnc_ns(NAMESPACE,"test9-poll", "string", test_string, 1,IND_BEHAVIOUR_LEVEL_EDGE) == IND_OK); + assert ( ind_reg_pollfnc_ns(NAMESPACE,"test9-poll", "string", test_string, 1,IND_BEHAVIOR_LEVEL_EDGE) == IND_OK); /* Register a property for the test9 class */ Index: Test_reg_pollfnc3.c =================================================================== RCS file: /cvsroot/sblim/indication_helper/test/Test_reg_pollfnc3.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Test_reg_pollfnc3.c 19 Apr 2005 16:04:24 -0000 1.2 +++ Test_reg_pollfnc3.c 17 May 2005 17:20:31 -0000 1.3 @@ -42,15 +42,15 @@ for (loops =0; loops < 5; loops++) { /* Register */ - assert ( ind_reg_pollfnc("test1", "A", test1, 10, IND_BEHAVIOUR_LEVEL_EDGE) == IND_OK); + assert ( ind_reg_pollfnc("test1", "A", test1, 10, IND_BEHAVIOR_LEVEL_EDGE) == IND_OK); - assert ( ind_reg_pollfnc("test1", "A", NULL, 10,IND_BEHAVIOUR_LEVEL_EDGE) == IND_DUPLICATE); + assert ( ind_reg_pollfnc("test1", "A", NULL, 10,IND_BEHAVIOR_LEVEL_EDGE) == IND_DUPLICATE); - assert ( ind_reg_pollfnc("test1" ,"B", test1, 20,IND_BEHAVIOUR_AGAINST_ZERO) == IND_OK); + assert ( ind_reg_pollfnc("test1" ,"B", test1, 20,IND_BEHAVIOR_AGAINST_ZERO) == IND_OK); - assert ( ind_reg_pollfnc("test1", "C", test1, 30,IND_BEHAVIOUR_LEVEL_EDGE) == IND_OK); + assert ( ind_reg_pollfnc("test1", "C", test1, 30,IND_BEHAVIOR_LEVEL_EDGE) == IND_OK); - assert ( ind_reg_pollfnc("test2", "D", test2, 2,IND_BEHAVIOUR_LEVEL_EDGE) == IND_OK); + assert ( ind_reg_pollfnc("test2", "D", test2, 2,IND_BEHAVIOR_LEVEL_EDGE) == IND_OK); /* Modify the function */ @@ -87,13 +87,13 @@ } - assert ( ind_reg_pollfnc("test1", "A", test1, 10, IND_BEHAVIOUR_AGAINST_ZERO) == IND_OK); + assert ( ind_reg_pollfnc("test1", "A", test1, 10, IND_BEHAVIOR_AGAINST_ZERO) == IND_OK); - assert ( ind_reg_pollfnc("test1" ,"B", test1, 20, IND_BEHAVIOUR_AGAINST_ZERO) == IND_OK); + assert ( ind_reg_pollfnc("test1" ,"B", test1, 20, IND_BEHAVIOR_AGAINST_ZERO) == IND_OK); - assert ( ind_reg_pollfnc("test1", "C", test1, 30, IND_BEHAVIOUR_AGAINST_ZERO) == IND_OK); + assert ( ind_reg_pollfnc("test1", "C", test1, 30, IND_BEHAVIOR_AGAINST_ZERO) == IND_OK); - assert ( ind_reg_pollfnc("test2", "D", test2, 2, IND_BEHAVIOUR_AGAINST_ZERO) == IND_OK); + assert ( ind_reg_pollfnc("test2", "D", test2, 2, IND_BEHAVIOR_AGAINST_ZERO) == IND_OK); /* They should be deleted in order of : D A B C */ assert ( ind_shutdown() == IND_OK); printf("+++ %s succedeed\n",__FILE__); Index: Test_genIndication.c =================================================================== RCS file: /cvsroot/sblim/indication_helper/test/Test_genIndication.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Test_genIndication.c 19 Apr 2005 16:04:23 -0000 1.3 +++ Test_genIndication.c 17 May 2005 17:20:31 -0000 1.4 @@ -22,6 +22,12 @@ #include <unistd.h> #include <string.h> +#ifdef CMPI_VER_100 +#define CONST const +#else +#define CONST +#endif + static CMPIBroker b; static CMPIContext ctx; static int debug = 0; @@ -33,28 +39,28 @@ IndErrorT test_string(CMPIData *v); IndErrorT get_value(CMPIData *v); IndErrorT get_value_string(CMPIData *v); -char * _fake_getCharPtrString (CMPIString* st, CMPIStatus* rc); +char * _fake_getCharPtrString (CONST CMPIString* st, CMPIStatus* rc); CMPIStatus _fake_releaseString (CMPIString* st) ; -CMPIString* _fake_cloneString(CMPIString* st, CMPIStatus* rc); -CMPIString* _fake_newString (CMPIBroker* mb, const char *data, CMPIStatus* rc); +CMPIString* _fake_cloneString(CONST CMPIString* st, CMPIStatus* rc); +CMPIString* _fake_newString (CONST CMPIBroker* mb, const char *data, CMPIStatus* rc); CMPIStatus _fake_release_ObjectPath (CMPIObjectPath* op); -CMPIObjectPath* _fake_clone_ObjectPath (CMPIObjectPath* op, CMPIStatus* rc); -CMPIObjectPath* _fake_newObjectPath (CMPIBroker* mb, const char *ns, const char *cn, CMPIStatus* rc); +CMPIObjectPath* _fake_clone_ObjectPath (CONST CMPIObjectPath* op, CMPIStatus* rc); +CMPIObjectPath* _fake_newObjectPath (CONST CMPIBroker* mb, const char *ns, const char *cn, CMPIStatus* rc); CMPIStatus _fake_release_Instance (CMPIInstance* inst); -CMPIStatus _fake_setProperty_Instance (CMPIInstance* inst, const char *name, CMPIValue* value, CMPIType type); +CMPIStatus _fake_setProperty_Instance (CONST CMPIInstance* inst, const char *name, CONST CMPIValue* value, CMPIType type); -CMPIInstance* _fake_clone_Instance (CMPIInstance* inst, CMPIStatus* rc); -CMPIInstance* _fake_newInstance (CMPIBroker* mb,CMPIObjectPath* op,CMPIStatus* rc); +CMPIInstance* _fake_clone_Instance (CONST CMPIInstance* inst, CMPIStatus* rc); +CMPIInstance* _fake_newInstance (CONST CMPIBroker* mb,CONST CMPIObjectPath* op,CMPIStatus* rc); CMPIStatus _fake_release_Select (CMPISelectExp* se); -CMPIString* _fake_getString_Select(CMPISelectExp* se, CMPIStatus* rc); -CMPIBoolean _fake_evaluate_Select(CMPISelectExp* se, CMPIInstance* inst_s, CMPIStatus* rc); -CMPISelectExp* _fake_clone_Select(CMPISelectExp* se, CMPIStatus* rc); -CMPISelectExp* _fake_newSelectExp(CMPIBroker* mb, const char *query, const char *lang,CMPIArray** projection, CMPIStatus* st); -CMPIStatus _fake_deliverIndication (CMPIBroker* mb, CMPIContext* ctx, const char *ns, CMPIInstance* ind); -CMPIContext* _fake_prepareAttachThread(CMPIBroker* mb, CMPIContext* ctx); -CMPIStatus _fake_attachThread (CMPIBroker*b, CMPIContext*c); -CMPIStatus _fake_detachThread (CMPIBroker* mb, CMPIContext* ctx); -CMPIString* _fake_toString (CMPIBroker* mb, void* object, CMPIStatus* rc); +CMPIString* _fake_getString_Select(CONST CMPISelectExp* se, CMPIStatus* rc); +CMPIBoolean _fake_evaluate_Select(CONST CMPISelectExp* se, CONST CMPIInstance* inst_s, CMPIStatus* rc); +CMPISelectExp* _fake_clone_Select(CONST CMPISelectExp* se, CMPIStatus* rc); +CMPISelectExp* _fake_newSelectExp(CONST CMPIBroker* mb, const char *query, const char *lang,CMPIArray** projection, CMPIStatus* st); +CMPIStatus _fake_deliverIndication (CONST CMPIBroker* mb, CONST CMPIContext* ctx, const char *ns, CONST CMPIInstance* ind); +CMPIContext* _fake_prepareAttachThread(CONST CMPIBroker* mb, CONST CMPIContext* ctx); +CMPIStatus _fake_attachThread (CONST CMPIBroker*b, CONST CMPIContext*c); +CMPIStatus _fake_detachThread (CONST CMPIBroker* mb, CONST CMPIContext* ctx); +CMPIString* _fake_toString (CONST CMPIBroker* mb, CONST void* object, CMPIStatus* rc); /* Test routines. Everytime they are called, the @@ -151,7 +157,7 @@ CMPIStatus bad = {CMPI_RC_ERROR, NULL}; /* Fake CMPIString handlers */ -char * _fake_getCharPtrString (CMPIString* st, CMPIStatus* rc) +char * _fake_getCharPtrString (CONST CMPIString* st, CMPIStatus* rc) { /* if (debug) @@ -174,7 +180,7 @@ return good; } -CMPIString* _fake_cloneString(CMPIString* st, CMPIStatus* rc) +CMPIString* _fake_cloneString(CONST CMPIString* st, CMPIStatus* rc) { CMPIString *s = (CMPIString *)malloc( sizeof(CMPIString)); @@ -198,7 +204,7 @@ return s; } -CMPIString* _fake_newString (CMPIBroker* mb, const char *data, CMPIStatus* rc) +CMPIString* _fake_newString (CONST CMPIBroker* mb, const char *data, CMPIStatus* rc) { CMPIString *s = (CMPIString *)malloc(sizeof(CMPIString)); @@ -245,7 +251,7 @@ return good; } -CMPIObjectPath* _fake_clone_ObjectPath (CMPIObjectPath* op, CMPIStatus* rc) +CMPIObjectPath* _fake_clone_ObjectPath (CONST CMPIObjectPath* op, CMPIStatus* rc) { CMPIObjectPath *objpath; _objPath *objPathData, *old; @@ -272,7 +278,7 @@ return objpath; } -CMPIObjectPath* _fake_newObjectPath (CMPIBroker* mb, const char *ns, const char *cn, CMPIStatus* rc) +CMPIObjectPath* _fake_newObjectPath (CONST CMPIBroker* mb, const char *ns, const char *cn, CMPIStatus* rc) { CMPIObjectPath *objpath; _objPath *objPathData; @@ -360,7 +366,7 @@ free(inst); return good; } -CMPIStatus _fake_setProperty_Instance (CMPIInstance* inst, const char *name, CMPIValue* value, CMPIType type) +CMPIStatus _fake_setProperty_Instance (CONST CMPIInstance* inst, const char *name, CONST CMPIValue* value, CMPIType type) { /* No checking to see if the value exist */ _instance *last,*p; @@ -404,7 +410,7 @@ return good; } -CMPIInstance* _fake_clone_Instance (CMPIInstance* inst, CMPIStatus* rc) +CMPIInstance* _fake_clone_Instance (CONST CMPIInstance* inst, CMPIStatus* rc) { CMPIInstance *instance; _instance *_inst, *_old, *p, *q; @@ -459,7 +465,7 @@ } -CMPIInstance* _fake_newInstance (CMPIBroker* mb,CMPIObjectPath* op,CMPIStatus* rc) +CMPIInstance* _fake_newInstance (CONST CMPIBroker* mb,CONST CMPIObjectPath* op,CMPIStatus* rc) { CMPIInstance *inst; _instance *instance; @@ -499,7 +505,7 @@ } -CMPIString* _fake_getString_Select(CMPISelectExp* se, CMPIStatus* rc) +CMPIString* _fake_getString_Select(CONST CMPISelectExp* se, CMPIStatus* rc) { CMPIString *s; @@ -508,7 +514,7 @@ return s; } -CMPIBoolean _fake_evaluate_Select(CMPISelectExp* se, CMPIInstance* inst_s, CMPIStatus* rc) +CMPIBoolean _fake_evaluate_Select(CONST CMPISelectExp* se, CONST CMPIInstance* inst_s, CMPIStatus* rc) { _instance *inst; CMPIObjectPath *objPath; @@ -537,7 +543,7 @@ } -CMPISelectExp* _fake_clone_Select(CMPISelectExp* se, CMPIStatus* rc) +CMPISelectExp* _fake_clone_Select(CONST CMPISelectExp* se, CMPIStatus* rc) { CMPISelectExp *filter; @@ -559,7 +565,7 @@ } -CMPISelectExp* _fake_newSelectExp(CMPIBroker* mb, const char *query, const char *lang,CMPIArray** projection, CMPIStatus* st) +CMPISelectExp* _fake_newSelectExp(CONST CMPIBroker* mb, const char *query, const char *lang,CMPIArray** projection, CMPIStatus* st) { CMPISelectExp *filter; @@ -583,7 +589,7 @@ /* Fake deliver indication */ -CMPIStatus _fake_deliverIndication (CMPIBroker* mb, CMPIContext* ctx, const char *ns, CMPIInstance* ind) +CMPIStatus _fake_deliverIndication (CONST CMPIBroker* mb, CONST CMPIContext* ctx, const char *ns, CONST CMPIInstance* ind) { _instance *inst, *p; CMPIObjectPath *objPath; @@ -613,28 +619,28 @@ } -CMPIContext* _fake_prepareAttachThread(CMPIBroker* mb, CMPIContext* ctx) +CMPIContext* _fake_prepareAttachThread(CONST CMPIBroker* mb, CONST CMPIContext* ctx) { if (debug) fprintf(stderr,"_fake_prepareAttachThread called.\n"); return &context; } -CMPIStatus _fake_attachThread (CMPIBroker*b, CMPIContext*c) +CMPIStatus _fake_attachThread (CONST CMPIBroker*b, CONST CMPIContext*c) { if (debug) fprintf(stderr,"_fake_attachThread called.\n"); return good; } -CMPIStatus _fake_detachThread (CMPIBroker* mb, CMPIContext* ctx) +CMPIStatus _fake_detachThread (CONST CMPIBroker* mb, CONST CMPIContext* ctx) { if (debug) fprintf(stderr,"_fake_detachThread called.\n"); return good; } -CMPIString* _fake_toString (CMPIBroker* mb, void* object, CMPIStatus* rc) +CMPIString* _fake_toString (CONST CMPIBroker* mb, CONST void* object, CMPIStatus* rc) { CMPIString *val = mb->eft->newString(mb, "Unknown", rc); return val; @@ -678,9 +684,9 @@ assert ( ind_reg(&b, &ctx) == IND_OK); /* Register functions with data types */ - assert ( ind_reg_pollfnc_ns(NAMESPACE,"test8-poll", "string", test_string, 1, IND_BEHAVIOUR_LEVEL_EDGE) == IND_OK); + assert ( ind_reg_pollfnc_ns(NAMESPACE,"test8-poll", "string", test_string, 1, IND_BEHAVIOR_LEVEL_EDGE) == IND_OK); - assert ( ind_reg_pollfnc_ns(NAMESPACE,"test8-poll", "uint16", test_uint16, 1, IND_BEHAVIOUR_AGAINST_ZERO) == IND_OK); + assert ( ind_reg_pollfnc_ns(NAMESPACE,"test8-poll", "uint16", test_uint16, 1, IND_BEHAVIOR_AGAINST_ZERO) == IND_OK); /* Register a property for the test8 class */ |
|
From: Konrad R. <kon...@us...> - 2005-05-17 17:20:41
|
Update of /cvsroot/sblim/indication_helper In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4581 Modified Files: ind_helper.c ind_helper.h Log Message: BUG#: 1199129 ( Providers won't compile with CMPI 1.0) Porting ind_helper library to CMPI 1.00 spec. Changing spelling of BEHAVIOUR to BEHAVIOR Index: ind_helper.h =================================================================== RCS file: /cvsroot/sblim/indication_helper/ind_helper.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ind_helper.h 11 May 2005 14:07:06 -0000 1.3 +++ ind_helper.h 17 May 2005 17:20:31 -0000 1.4 @@ -75,7 +75,7 @@ check_os); */ -#define IND_BEHAVIOUR_LEVEL_EDGE 32 +#define IND_BEHAVIOR_LEVEL_EDGE 32 /* The polling function (defined as the <li>check</li) will @@ -119,7 +119,7 @@ */ -#define IND_BEHAVIOUR_AGAINST_ZERO 64 +#define IND_BEHAVIOR_AGAINST_ZERO 64 /** * Return codes. */ Index: ind_helper.c =================================================================== RCS file: /cvsroot/sblim/indication_helper/ind_helper.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ind_helper.c 19 Apr 2005 16:04:15 -0000 1.7 +++ ind_helper.c 17 May 2005 17:20:22 -0000 1.8 @@ -42,7 +42,7 @@ #define DEFAULT_NAMESPACE "root/cimv2" -#define IND_BEHAVIOUR_NONE 0 +#define IND_BEHAVIOR_NONE 0 /* * Flags used in ind_class_property.flag value */ @@ -422,7 +422,7 @@ char *pn, IndErrorT (*getAlertProperty) (CMPIData *)) { return _addProperty (&ind_class_properties, ns, - ci, pn, getAlertProperty, 0, IND_BEHAVIOUR_NONE, NULL); + ci, pn, getAlertProperty, 0, IND_BEHAVIOR_NONE, NULL); } @@ -432,7 +432,7 @@ /* First we must add it */ _addProperty (&ind_class_properties, ns, - cn, pn, NULL, 0, IND_BEHAVIOUR_NONE, NULL); + cn, pn, NULL, 0, IND_BEHAVIOR_NONE, NULL); return _modifyProperty (&ind_class_properties, ns, cn, pn, CHANGE_DATA, 0, NULL, d); @@ -668,7 +668,7 @@ rc = _addProperty (&ind_filters, ns, ci, CMGetCharPtr (filter_str), NULL, /* No function */ 0, /* No timer */ - IND_BEHAVIOUR_NONE, /* No logic */ + IND_BEHAVIOR_NONE, /* No logic */ filter); IND_HLP_DEBUG ("ind_set_select exited."); @@ -1145,13 +1145,13 @@ } /* There are two mechanism to do the logic comparison: - IND_BEHAVIOUR_LEVEL_EDGE - IND_BEHAVIOUR_AGAINST_ZERO + IND_BEHAVIOR_LEVEL_EDGE + IND_BEHAVIOR_AGAINST_ZERO */ - if (p->logic == IND_BEHAVIOUR_AGAINST_ZERO) + if (p->logic == IND_BEHAVIOR_AGAINST_ZERO) { IND_HLP_DEBUG - ("Logic is IND_BEHAVIOUR_AGAINST_ZERO"); + ("Logic is IND_BEHAVIOR_AGAINST_ZERO"); if ((p->flag & FIRST_TIME) == FIRST_TIME) { /* No need for this anymore. Remove it */ @@ -1174,7 +1174,7 @@ } else { - IND_HLP_DEBUG ("Logic is IND_BEHAVIOUR_LEVEL_EDGE"); + IND_HLP_DEBUG ("Logic is IND_BEHAVIOR_LEVEL_EDGE"); } if ((_compareCIMValue (data, p->data) != 0)) { /* Yeey, data changed! */ @@ -1182,7 +1182,7 @@ IND_HLP_DEBUG ("Yeey, data changed! Generate indication.\n"); - if (p->logic == IND_BEHAVIOUR_LEVEL_EDGE) + if (p->logic == IND_BEHAVIOR_LEVEL_EDGE) { /* Only keep the past property values if LEVEL_EDGE is used */ _releaseData (&p->data); @@ -1415,7 +1415,7 @@ /* Set each individual entry */ property->flag = UNLOCK; - if (logic == IND_BEHAVIOUR_AGAINST_ZERO) + if (logic == IND_BEHAVIOR_AGAINST_ZERO) property->flag |= FIRST_TIME; property->logic = logic; @@ -1466,9 +1466,9 @@ data.type = CMPI_null; data.state = CMPI_nullValue; /* We do not need to call the check function if our - logic is using IND_BEHAVIOUR_AGAINST_ZERO to get the + logic is using IND_BEHAVIOR_AGAINST_ZERO to get the previous value. */ - if (logic == IND_BEHAVIOUR_LEVEL_EDGE) + if (logic == IND_BEHAVIOR_LEVEL_EDGE) { if ((rc = check (&data)) != IND_OK) { @@ -1476,7 +1476,7 @@ goto exit_error; } /* This is where the data is copied in-to memory */ - /* Not needed when the logic is IND_BEHAVIOUR_AGAINST_ZERO here, as + /* Not needed when the logic is IND_BEHAVIOR_AGAINST_ZERO here, as the _worker will call the check function and then populate the property->data */ if ((rc = _cloneData (&property->data, &data)) != IND_OK) |
|
From: Adrian S. <a3s...@us...> - 2005-05-17 13:04:32
|
Update of /cvsroot/sblim/sfcb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9676 Modified Files: args.c instance.c objectpath.c Log Message: Fixed [ 1199104 ] Segfault on setProperty with a NULL char pointer fixed by checking for value && value->string && value->string->hdl. Checks done in instance.c objectpath.c and args.c Index: args.c =================================================================== RCS file: /cvsroot/sblim/sfcb/args.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- args.c 26 Apr 2005 21:58:46 -0000 1.2 +++ args.c 17 May 2005 13:04:21 -0000 1.3 @@ -93,6 +93,12 @@ if (type == CMPI_chars) data.value.chars = (char *) value; + else if (type == CMPI_string) { + if (value && value->string && value->string->hdl) + data.value.chars = (char *) value->string->hdl; + else data.value.chars=NULL; + data.type=CMPI_chars; + } else if (type == CMPI_sint64 || type == CMPI_uint64 || type == CMPI_real64) data.value = *value; else Index: objectpath.c =================================================================== RCS file: /cvsroot/sblim/sfcb/objectpath.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- objectpath.c 26 Apr 2005 14:11:20 -0000 1.4 +++ objectpath.c 17 May 2005 13:04:21 -0000 1.5 @@ -216,7 +216,9 @@ if (type == CMPI_chars) data.value.chars = (char *) value; else if (type == CMPI_string) { - data.value.chars = (char *) value->string->hdl; + if (value && value->string && value->string->hdl) + data.value.chars = (char *) value->string->hdl; + else data.value.chars=NULL; data.type=CMPI_chars; } else if (type == CMPI_sint64 || type == CMPI_uint64 || type == CMPI_real64) Index: instance.c =================================================================== RCS file: /cvsroot/sblim/sfcb/instance.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- instance.c 26 Apr 2005 14:11:19 -0000 1.4 +++ instance.c 17 May 2005 13:04:21 -0000 1.5 @@ -217,7 +217,9 @@ if (type == CMPI_chars) data.value.chars = (char *) value; else if (type == CMPI_string) { - data.value.chars = (char *) value->string->hdl; + if (value && value->string && value->string->hdl) + data.value.chars = (char *) value->string->hdl; + else data.value.chars=NULL; data.type=CMPI_chars; } else if (type == CMPI_sint64 || type == CMPI_uint64 || type == CMPI_real64) |
|
From: Gareth S B. <bes...@us...> - 2005-05-13 22:55:59
|
Update of /cvsroot/sblim/cmpi-tests/cmpi-instancetest/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28729/cmpi-instancetest/src Modified Files: TST_InstanceTest.c Log Message: CMClone/CMRelease fixes Index: TST_InstanceTest.c =================================================================== RCS file: /cvsroot/sblim/cmpi-tests/cmpi-instancetest/src/TST_InstanceTest.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- TST_InstanceTest.c 12 May 2005 00:53:19 -0000 1.2 +++ TST_InstanceTest.c 13 May 2005 22:55:50 -0000 1.3 @@ -1116,8 +1116,9 @@ /* 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]); + + /* Return a copy of this instance (all results are free'd on CMReturnDone) */ + CMReturnInstance(results, CMClone(instances[i],NULL)); found++; } @@ -1160,7 +1161,9 @@ CMSetStatusWithChars(_BROKER, &status, CMPI_RC_ERR_NOT_FOUND, "Requested instance not found"); goto exit; } - CMReturnInstance(results, instances[index]); + + /* Return a copy of this instance (all results are free'd on CMReturnDone) */ + CMReturnInstance(results, CMClone(instances[index],NULL)); /* Finished */ CMReturnDone(results); @@ -1233,9 +1236,13 @@ goto exit; } - /* To be safe, make a copy of the new instance and replace the old instance */ + /* Remove the old instance from the internal list of instances */ + CMRelease(instances[index]); + + /* Replace it with a copy of the new instance */ newinstancecopy = CMClone(newinstance, &status); if ((status.rc != CMPI_RC_OK) || CMIsNullObject(newinstance)) { + instances[index] = NULL; _OSBASE_TRACE(1,("%s:SetInstance() CMClone() failed", _PROVIDERNAME)); CMSetStatusWithChars(_BROKER, &status, CMPI_RC_ERROR_SYSTEM, "CMClone() failed"); goto exit; @@ -1358,6 +1365,9 @@ CMSetStatusWithChars(_BROKER, &status, CMPI_RC_ERR_NOT_FOUND, "Requested instance not found"); goto exit; } + + /* Remove the instance from the internal list of instances */ + CMRelease(instances[index]); instances[index] = NULL; /* Finished */ @@ -1463,7 +1473,10 @@ free(_PROVIDERNAME); /* Free entries in the instances list */ - for (i=0; i<sizeinstances; i++) free(instances[i]); + for (i=0; i<sizeinstances; i++) { + if (instances[i] != NULL) CMRelease(instances[i]); + free(instances[i]); + } /* Finished */ exit: @@ -1483,7 +1496,7 @@ 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 */ - int instancenum = 2; /* Number of instances to populate the internal list */ + int instancenum = 1; /* Number of instances to populate the internal list */ _OSBASE_TRACE(1,("%s:Initialize() called", self->ft->miName)); |
|
From: Gareth S B. <bes...@us...> - 2005-05-13 20:37:23
|
Update of /cvsroot/sblim/cmpi-tests/cmpi-instancetest/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv804 Added Files: TST_InstanceProperties.008.ci.OK TST_InstanceProperties.008.ci.xml TST_InstanceProperties.009.ci.OK TST_InstanceProperties.009.ci.xml TST_InstanceProperties.010.ci.OK TST_InstanceProperties.010.ci.xml Log Message: added createinstance tests --- NEW FILE: TST_InstanceProperties.009.ci.xml --- <?xml version="1.0" encoding="utf-8" ?> <CIM CIMVERSION="2.0" DTDVERSION="2.0"> <MESSAGE ID="4711" PROTOCOLVERSION="1.0"><SIMPLEREQ><IMETHODCALL NAME="CreateInstance"><LOCALNAMESPACEPATH><NAMESPACE NAME="root"></NAMESPACE><NAMESPACE NAME="cimv2"></NAMESPACE></LOCALNAMESPACEPATH> <IPARAMVALUE NAME="NewInstance"><INSTANCE CLASSNAME="TST_InstanceProperties"><QUALIFIER NAME="Abstract" TYPE="boolean"> <VALUE>TRUE</VALUE> </QUALIFIER><QUALIFIER NAME="Abstract" TYPE="boolean"> <VALUE>TRUE</VALUE> </QUALIFIER><QUALIFIER NAME="Version" TYPE="string"> <VALUE>2.2.0</VALUE> </QUALIFIER><QUALIFIER NAME="Description" TYPE="string"> <VALUE>Test class containing all the simple property types</VALUE> </QUALIFIER> <PROPERTY NAME="CreationClassName" TYPE="string"><VALUE>TST_InstanceProperties</VALUE></PROPERTY> <PROPERTY NAME="Id" TYPE="string"><VALUE>Instance #3</VALUE></PROPERTY> <PROPERTY NAME="Property_string" TYPE="string"><VALUE>This is instance #3</VALUE></PROPERTY></INSTANCE></IPARAMVALUE> </IMETHODCALL></SIMPLEREQ> </MESSAGE></CIM> --- NEW FILE: TST_InstanceProperties.008.ci.xml --- <?xml version="1.0" encoding="utf-8" ?> <CIM CIMVERSION="2.0" DTDVERSION="2.0"> <MESSAGE ID="4711" PROTOCOLVERSION="1.0"><SIMPLEREQ><IMETHODCALL NAME="CreateInstance"><LOCALNAMESPACEPATH><NAMESPACE NAME="root"></NAMESPACE><NAMESPACE NAME="cimv2"></NAMESPACE></LOCALNAMESPACEPATH> <IPARAMVALUE NAME="NewInstance"><INSTANCE CLASSNAME="TST_InstanceProperties"><QUALIFIER NAME="Abstract" TYPE="boolean"> <VALUE>TRUE</VALUE> </QUALIFIER><QUALIFIER NAME="Abstract" TYPE="boolean"> <VALUE>TRUE</VALUE> </QUALIFIER><QUALIFIER NAME="Version" TYPE="string"> <VALUE>2.2.0</VALUE> </QUALIFIER><QUALIFIER NAME="Description" TYPE="string"> <VALUE>Test class containing all the simple property types</VALUE> </QUALIFIER> <PROPERTY NAME="CreationClassName" TYPE="string"><VALUE>TST_InstanceProperties</VALUE></PROPERTY> <PROPERTY NAME="Id" TYPE="string"><VALUE>Instance #3</VALUE></PROPERTY> <PROPERTY NAME="Property_string" TYPE="string"><VALUE>This is instance #3</VALUE></PROPERTY></INSTANCE></IPARAMVALUE> </IMETHODCALL></SIMPLEREQ> </MESSAGE></CIM> --- NEW FILE: TST_InstanceProperties.008.ci.OK --- <?xml version="1.0" encoding="utf-8" ?> <CIM CIMVERSION="2.0" DTDVERSION="1.1"> <MESSAGE ID="4711" PROTOCOLVERSION="1.0"> <SIMPLERSP> <IMETHODRESPONSE NAME="CreateInstance"> <IRETURNVALUE> <INSTANCENAME CLASSNAME="TST_InstanceProperties"> <KEYBINDING NAME="CreationClassName"> <KEYVALUE VALUETYPE="string">TST_InstanceProperties</KEYVALUE> </KEYBINDING> <KEYBINDING NAME="Id"> <KEYVALUE VALUETYPE="string">Instance #3</KEYVALUE> </KEYBINDING> </INSTANCENAME> </IRETURNVALUE> </IMETHODRESPONSE> </SIMPLERSP> </MESSAGE> </CIM> --- NEW FILE: TST_InstanceProperties.010.ci.xml --- <?xml version="1.0" encoding="utf-8" ?> <CIM CIMVERSION="2.0" DTDVERSION="2.0"> <MESSAGE ID="4711" PROTOCOLVERSION="1.0"><SIMPLEREQ><IMETHODCALL NAME="CreateInstance"><LOCALNAMESPACEPATH><NAMESPACE NAME="root"></NAMESPACE><NAMESPACE NAME="cimv2"></NAMESPACE></LOCALNAMESPACEPATH> <IPARAMVALUE NAME="NewInstance"><INSTANCE CLASSNAME="TST_InstanceProperties"><QUALIFIER NAME="Abstract" TYPE="boolean"> <VALUE>TRUE</VALUE> </QUALIFIER><QUALIFIER NAME="Abstract" TYPE="boolean"> <VALUE>TRUE</VALUE> </QUALIFIER><QUALIFIER NAME="Version" TYPE="string"> <VALUE>2.2.0</VALUE> </QUALIFIER><QUALIFIER NAME="Description" TYPE="string"> <VALUE>Test class containing all the simple property types</VALUE> </QUALIFIER> <PROPERTY NAME="CreationClassName" TYPE="string"><VALUE>TST_InstanceProperties</VALUE></PROPERTY> <PROPERTY NAME="Id" TYPE="string"><VALUE>Instance #4</VALUE></PROPERTY> <PROPERTY NAME="Property_string" TYPE="string"><VALUE>This is instance #4</VALUE></PROPERTY></INSTANCE></IPARAMVALUE> </IMETHODCALL></SIMPLEREQ> </MESSAGE></CIM> --- NEW FILE: TST_InstanceProperties.009.ci.OK --- <?xml version="1.0" encoding="utf-8" ?> <CIM CIMVERSION="2.0" DTDVERSION="1.1"> <MESSAGE ID="4711" PROTOCOLVERSION="1.0"> <SIMPLERSP> <IMETHODRESPONSE NAME="CreateInstance"> <ERROR CODE="11" DESCRIPTION="Instance already exists"/> </IMETHODRESPONSE> </SIMPLERSP> </MESSAGE> </CIM> --- NEW FILE: TST_InstanceProperties.010.ci.OK --- <?xml version="1.0" encoding="utf-8" ?> <CIM CIMVERSION="2.0" DTDVERSION="1.1"> <MESSAGE ID="4711" PROTOCOLVERSION="1.0"> <SIMPLERSP> <IMETHODRESPONSE NAME="CreateInstance"> <IRETURNVALUE> <INSTANCENAME CLASSNAME="TST_InstanceProperties"> <KEYBINDING NAME="CreationClassName"> <KEYVALUE VALUETYPE="string">TST_InstanceProperties</KEYVALUE> </KEYBINDING> <KEYBINDING NAME="Id"> <KEYVALUE VALUETYPE="string">Instance #4</KEYVALUE> </KEYBINDING> </INSTANCENAME> </IRETURNVALUE> </IMETHODRESPONSE> </SIMPLERSP> </MESSAGE> </CIM> |
Update of /cvsroot/sblim/cmpi-devel/cmpi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20639/cmpi Modified Files: CmpiAssociationMI.h CmpiBaseMI.h CmpiIndicationMI.h CmpiInstanceMI.h CmpiMethodMI.h CmpiPropertyMI.h cmpimacs.h Log Message: Bugs Fixed: 1201389. C++ CMPI Wrapper Providers won't compile with 1.0.0 and must use this level instead. Index: CmpiInstanceMI.h =================================================================== RCS file: /cvsroot/sblim/cmpi-devel/cmpi/CmpiInstanceMI.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- CmpiInstanceMI.h 18 Mar 2005 13:45:39 -0000 1.1.1.1 +++ CmpiInstanceMI.h 13 May 2005 14:31:43 -0000 1.2 @@ -43,26 +43,27 @@ CmpiInstanceMI(const CmpiBroker &mbp, const CmpiContext& ctx); static CMPIStatus driveEnumInstanceNames - (CMPIInstanceMI* mi,CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eCop); + (CMPIInstanceMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eCop); static CMPIStatus driveEnumInstances - (CMPIInstanceMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eCop, char* *properties); + (CMPIInstanceMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eCop, const char* *properties); static CMPIStatus driveGetInstance - (CMPIInstanceMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eCop, char* *properties); + (CMPIInstanceMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eCop, const char* *properties); static CMPIStatus driveCreateInstance - (CMPIInstanceMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eCop, CMPIInstance* eInst); + (CMPIInstanceMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eCop, const CMPIInstance* eInst); static CMPIStatus driveSetInstance - (CMPIInstanceMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eCop, CMPIInstance* eInst, char* *properties); + (CMPIInstanceMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eCop, const CMPIInstance* eInst, + const char* *properties); static CMPIStatus driveDeleteInstance - (CMPIInstanceMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eCop); + (CMPIInstanceMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eCop); static CMPIStatus driveExecQuery - (CMPIInstanceMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eCop, char* language ,char* query); + (CMPIInstanceMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eCop, const char* language ,const char* query); virtual CmpiStatus enumInstanceNames Index: CmpiAssociationMI.h =================================================================== RCS file: /cvsroot/sblim/cmpi-devel/cmpi/CmpiAssociationMI.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- CmpiAssociationMI.h 18 Mar 2005 13:45:39 -0000 1.1.1.1 +++ CmpiAssociationMI.h 13 May 2005 14:31:42 -0000 1.2 @@ -41,20 +41,20 @@ CmpiAssociationMI(const CmpiBroker &mbp, const CmpiContext& ctx); static CMPIStatus driveAssociators - (CMPIAssociationMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eOp, const char* asscClass, const char* resultClass, - const char* role, const char* resultRole, char** properties); + (CMPIAssociationMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eOp, const char* asscClass, const char* resultClass, + const char* role, const char* resultRole, const char** properties); static CMPIStatus driveAssociatorNames - (CMPIAssociationMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eOp, const char* assocClass, const char* resultClass, + (CMPIAssociationMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eOp, const char* assocClass, const char* resultClass, const char* role, const char* resultRole); static CMPIStatus driveReferences - (CMPIAssociationMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eOp, const char* resultClass, const char* role , - char** properties); + (CMPIAssociationMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eOp, const char* resultClass, const char* role , + const char** properties); static CMPIStatus driveReferenceNames - (CMPIAssociationMI*, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eOp, const char* resultClass, const char* role); + (CMPIAssociationMI*, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eOp, const char* resultClass, const char* role); virtual CmpiStatus associators (const CmpiContext& ctx, CmpiResult& rslt, Index: CmpiIndicationMI.h =================================================================== RCS file: /cvsroot/sblim/cmpi-devel/cmpi/CmpiIndicationMI.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- CmpiIndicationMI.h 18 Mar 2005 13:45:40 -0000 1.1.1.1 +++ CmpiIndicationMI.h 13 May 2005 14:31:43 -0000 1.2 @@ -42,17 +42,20 @@ CmpiIndicationMI(const CmpiBroker &mbp, const CmpiContext& ctx); static CMPIStatus driveAuthorizeFilter - (CMPIIndicationMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPISelectExp* se, const char* ns, CMPIObjectPath* op, const char* user); + (CMPIIndicationMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPISelectExp* se, const char* ns, const CMPIObjectPath* op, + const char* user); static CMPIStatus driveMustPoll - (CMPIIndicationMI* mi, CMPIContext* eCtx, CMPIResult* eRrslt, - CMPISelectExp* se, const char* ns, CMPIObjectPath* op); + (CMPIIndicationMI* mi, const CMPIContext* eCtx, const CMPIResult* eRrslt, + const CMPISelectExp* se, const char* ns, const CMPIObjectPath* op); static CMPIStatus driveActivateFilter - (CMPIIndicationMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPISelectExp* se, const char* ns, CMPIObjectPath* op, CMPIBoolean first); + (CMPIIndicationMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPISelectExp* se, const char* ns, const CMPIObjectPath* op, + CMPIBoolean first); static CMPIStatus driveDeActivateFilter - (CMPIIndicationMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPISelectExp* se, const char* ns, CMPIObjectPath* op, CMPIBoolean last); + (CMPIIndicationMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPISelectExp* se, const char* ns, + const CMPIObjectPath* op, CMPIBoolean last); static void driveEnableIndications (CMPIIndicationMI* mi); static void driveDisableIndications Index: CmpiBaseMI.h =================================================================== RCS file: /cvsroot/sblim/cmpi-devel/cmpi/CmpiBaseMI.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- CmpiBaseMI.h 18 Mar 2005 13:45:40 -0000 1.1.1.1 +++ CmpiBaseMI.h 13 May 2005 14:31:43 -0000 1.2 @@ -45,7 +45,7 @@ void setProviderBase(CmpiProviderBase* base); CmpiProviderBase* getProviderBase(); - static CMPIStatus driveBaseCleanup(void* mi, CMPIContext* eCtx); + static CMPIStatus driveBaseCleanup(void* mi, const CMPIContext* eCtx, CMPIBoolean* b); virtual CmpiStatus initialize(const CmpiContext& ctx); virtual CmpiStatus cleanup(CmpiContext& ctx); Index: CmpiMethodMI.h =================================================================== RCS file: /cvsroot/sblim/cmpi-devel/cmpi/CmpiMethodMI.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- CmpiMethodMI.h 18 Mar 2005 13:45:40 -0000 1.1.1.1 +++ CmpiMethodMI.h 13 May 2005 14:31:43 -0000 1.2 @@ -43,9 +43,9 @@ CmpiMethodMI(const CmpiBroker &mbp, const CmpiContext& ctx); static CMPIStatus driveInvokeMethod - (CMPIMethodMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eCop, const char* methodName, - CMPIArgs* eIn, CMPIArgs* eOut); + (CMPIMethodMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eCop, const char* methodName, + const CMPIArgs* eIn, CMPIArgs* eOut); virtual CmpiStatus invokeMethod (const CmpiContext& ctx, CmpiResult& rslt, Index: CmpiPropertyMI.h =================================================================== RCS file: /cvsroot/sblim/cmpi-devel/cmpi/CmpiPropertyMI.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- CmpiPropertyMI.h 18 Mar 2005 13:45:39 -0000 1.1.1.1 +++ CmpiPropertyMI.h 13 May 2005 14:31:43 -0000 1.2 @@ -42,11 +42,11 @@ CmpiPropertyMI(const CmpiBroker &mbp, const CmpiContext& ctx); static CMPIStatus driveSetProperty - (CMPIPropertyMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eOp, char* name, CMPIData data); + (CMPIPropertyMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eOp, const char* name, CMPIData data); static CMPIStatus driveGetProperty - (CMPIPropertyMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eOp, char* name); + (CMPIPropertyMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eOp, const char* name); virtual CmpiStatus setProperty (const CmpiContext& ctx, CmpiResult& rslt, Index: cmpimacs.h =================================================================== RCS file: /cvsroot/sblim/cmpi-devel/cmpi/cmpimacs.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- cmpimacs.h 10 May 2005 15:50:21 -0000 1.2 +++ cmpimacs.h 13 May 2005 14:31:43 -0000 1.3 @@ -2102,7 +2102,7 @@ CMPICurrentVersion, \ CMPICurrentVersion, \ "instance" #pn, \ - (CMPIStatus(*)(CMPIInstanceMI*,CMPIContext*))CmpiBaseMI::driveBaseCleanup, \ + (CMPIStatus(*)(CMPIInstanceMI*,const CMPIContext*,CMPIBoolean*))CmpiBaseMI::driveBaseCleanup, \ CmpiInstanceMI::driveEnumInstanceNames, \ CmpiInstanceMI::driveEnumInstances, \ CmpiInstanceMI::driveGetInstance, \ @@ -2113,11 +2113,11 @@ }; \ static CMPIInstanceMI mi; \ fprintf(stderr,"--- _Create_InstanceMI() broker: %p\n",broker); \ - CmpiContext ctx(ctxp); \ + CmpiContext ctx((CMPIContext*)ctxp); \ mi.ft=&instMIFT; \ CmpiBaseMI *provider=base##pn.getBaseMI(); \ if (provider == 0) {\ - provider = new cn(CmpiBroker(broker),ctx); \ + provider = new cn(CmpiBroker((CMPIBroker*)broker),ctx); \ provider->setProviderBase(&base##pn); \ provider->initialize(ctx); \ base##pn.setBaseMI(provider); \ @@ -2150,7 +2150,7 @@ CMPICurrentVersion, \ CMPICurrentVersion, \ "association" #pn, \ - (CMPIStatus(*)(CMPIAssociationMI*,CMPIContext*))CmpiBaseMI::driveBaseCleanup, \ + (CMPIStatus(*)(CMPIAssociationMI*,const CMPIContext*,CMPIBoolean*))CmpiBaseMI::driveBaseCleanup, \ CmpiAssociationMI::driveAssociators, \ CmpiAssociationMI::driveAssociatorNames, \ CmpiAssociationMI::driveReferences, \ @@ -2158,11 +2158,11 @@ }; \ static CMPIAssociationMI mi; \ fprintf(stderr,"--- _Create_AssociationMI() broker: %p\n",broker); \ - CmpiContext ctx(ctxp); \ + CmpiContext ctx((CMPIContext*)ctxp); \ mi.ft=&assocMIFT; \ CmpiBaseMI *provider=base##pn.getBaseMI(); \ if (provider == 0) {\ - provider = new cn(CmpiBroker(broker),ctx); \ + provider = new cn(CmpiBroker((CMPIBroker*)broker),ctx); \ provider->setProviderBase(&base##pn); \ provider->initialize(ctx); \ base##pn.setBaseMI(provider); \ @@ -2195,16 +2195,16 @@ CMPICurrentVersion, \ CMPICurrentVersion, \ "method" #pn, \ - (CMPIStatus(*)(CMPIMethodMI*,CMPIContext*))CmpiBaseMI::driveBaseCleanup, \ + (CMPIStatus(*)(CMPIMethodMI*,const CMPIContext*, CMPIBoolean*))CmpiBaseMI::driveBaseCleanup, \ CmpiMethodMI::driveInvokeMethod, \ }; \ static CMPIMethodMI mi; \ fprintf(stderr,"--- _Create_MethodMI() broker: %p\n",broker); \ - CmpiContext ctx(ctxp); \ + CmpiContext ctx((CMPIContext*)ctxp); \ mi.ft=&methMIFT; \ CmpiBaseMI *provider=base##pn.getBaseMI(); \ if (provider == 0) {\ - provider = new cn(CmpiBroker(broker),ctx); \ + provider = new cn(CmpiBroker((CMPIBroker*)broker),ctx); \ provider->setProviderBase(&base##pn); \ provider->initialize(ctx); \ base##pn.setBaseMI(provider); \ @@ -2236,17 +2236,17 @@ CMPICurrentVersion, \ CMPICurrentVersion, \ "property" #pn, \ - (CMPIStatus(*)(CMPIPropertyMI*,CMPIContext*))CmpiBaseMI::driveBaseCleanup, \ + (CMPIStatus(*)(CMPIPropertyMI*,const CMPIContext*,CMPIBoolean*))CmpiBaseMI::driveBaseCleanup, \ CmpiPropertyMI::driveSetProperty, \ CmpiPropertyMI::driveGetProperty, \ }; \ static CMPIPropertyMI mi; \ fprintf(stderr,"--- _Create_MethodMI() broker: %p\n",broker); \ - CmpiContext ctx(ctxp); \ + CmpiContext ctx((CMPIContext*)ctxp); \ mi.ft=&propMIFT; \ CmpiBaseMI *provider=base##pn.getBaseMI(); \ if (provider == 0) {\ - provider = new cn(CmpiBroker(broker),ctx); \ + provider = new cn(CmpiBroker((CMPIBroker*)broker),ctx); \ provider->setProviderBase(&base##pn); \ provider->initialize(ctx); \ base##pn.setBaseMI(provider); \ @@ -2287,7 +2287,7 @@ CMPICurrentVersion, \ CMPICurrentVersion, \ "indication" #pn, \ - (CMPIStatus(*)(CMPIIndicationMI*,CMPIContext*))CmpiBaseMI::driveBaseCleanup, \ + (CMPIStatus(*)(CMPIIndicationMI*,const CMPIContext*,CMPIBoolean*))CmpiBaseMI::driveBaseCleanup, \ CmpiIndicationMI::driveAuthorizeFilter, \ CmpiIndicationMI::driveMustPoll, \ CmpiIndicationMI::driveActivateFilter, \ @@ -2296,11 +2296,11 @@ }; \ static CMPIIndicationMI mi; \ fprintf(stderr,"--- _Create_IndicationMI() broker: %p\n",broker); \ - CmpiContext ctx(ctxp); \ + CmpiContext ctx((CMPIContext*)ctxp); \ mi.ft=&indMIFT; \ CmpiBaseMI *provider=base##pn.getBaseMI(); \ if (provider == 0) {\ - provider = new cn(CmpiBroker(broker),ctx); \ + provider = new cn(CmpiBroker((CMPIBroker*)broker),ctx); \ provider->setProviderBase(&base##pn); \ provider->initialize(ctx); \ base##pn.setBaseMI(provider); \ |
|
From: Viktor M. <mih...@us...> - 2005-05-13 14:31:52
|
Update of /cvsroot/sblim/cmpi-devel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20639 Modified Files: ChangeLog CmpiImpl.cpp NEWS configure.ac Log Message: Bugs Fixed: 1201389. C++ CMPI Wrapper Providers won't compile with 1.0.0 and must use this level instead. Index: NEWS =================================================================== RCS file: /cvsroot/sblim/cmpi-devel/NEWS,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NEWS 11 May 2005 11:04:09 -0000 1.2 +++ NEWS 13 May 2005 14:31:42 -0000 1.3 @@ -1,3 +1,9 @@ +Changes in 1.0.1 +================ + +Bugs fixed: +- 1201389 Fixed CMPI C++ Providers Build Break + Changes in 1.0.0 ================ Index: configure.ac =================================================================== RCS file: /cvsroot/sblim/cmpi-devel/configure.ac,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- configure.ac 10 May 2005 15:50:18 -0000 1.3 +++ configure.ac 13 May 2005 14:31:42 -0000 1.4 @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_INIT(sblim-cmpi-devel, 1.0.0, <mih...@de...>) +AC_INIT(sblim-cmpi-devel, 1.0.1, <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.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- CmpiImpl.cpp 10 May 2005 15:50:17 -0000 1.2 +++ CmpiImpl.cpp 13 May 2005 14:31:42 -0000 1.3 @@ -58,10 +58,10 @@ } CMPIStatus CmpiBaseMI::driveBaseCleanup - (void* vi, CMPIContext* eCtx) { + (void* vi, const CMPIContext* eCtx, CMPIBoolean *b) { try { CMPIInstanceMI *mi=( CMPIInstanceMI*)vi; - CmpiContext ctx(eCtx); + CmpiContext ctx((CMPIContext*)eCtx); CmpiStatus rc(CMPI_RC_OK); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*>(mi->hdl); if (cmi->isUnloadable()) { @@ -113,13 +113,13 @@ //--------------------------------------------------- CMPIStatus CmpiInstanceMI::driveEnumInstanceNames - (CMPIInstanceMI* mi,CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eCop) + (CMPIInstanceMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eCop) { try { - CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - CmpiObjectPath cop(eCop); + CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + CmpiObjectPath cop((CMPIObjectPath*)eCop); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiInstanceMI* imi = dynamic_cast<CmpiInstanceMI*>(cmi); return imi->enumInstanceNames(ctx,rslt,cop).status(); @@ -130,17 +130,17 @@ } CMPIStatus CmpiInstanceMI::driveEnumInstances - (CMPIInstanceMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eCop, char* *properties) + (CMPIInstanceMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eCop, const char* *properties) { try { - CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - CmpiObjectPath cop(eCop); + CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + CmpiObjectPath cop((CMPIObjectPath*)eCop); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiInstanceMI* imi = dynamic_cast<CmpiInstanceMI*>(cmi); return imi->enumInstances - (ctx,rslt,cop,(const char**)properties).status(); + (ctx,rslt,cop,properties).status(); } catch (CmpiStatus& stat) { cerr << "caught status :" << stat.rc() << " " << stat.msg() << endl; return stat.status(); @@ -148,17 +148,17 @@ } CMPIStatus CmpiInstanceMI::driveGetInstance - (CMPIInstanceMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eCop, char* *properties) + (CMPIInstanceMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eCop, const char* *properties) { try { - CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - CmpiObjectPath cop(eCop); + CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + CmpiObjectPath cop((CMPIObjectPath*)eCop); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiInstanceMI* imi = dynamic_cast<CmpiInstanceMI*>(cmi); return imi->getInstance - (ctx,rslt,cop,(const char**)properties).status(); + (ctx,rslt,cop,properties).status(); } catch (CmpiStatus& stat) { cerr << "caught status :" << stat.rc() << " " << stat.msg() << endl; return stat.status(); @@ -166,13 +166,13 @@ } CMPIStatus CmpiInstanceMI::driveCreateInstance - (CMPIInstanceMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eCop, CMPIInstance* eInst) + (CMPIInstanceMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eCop, const CMPIInstance* eInst) { try { - CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - CmpiObjectPath cop(eCop); + CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + CmpiObjectPath cop((CMPIObjectPath*)eCop); CmpiInstance inst(eInst); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiInstanceMI* imi = dynamic_cast<CmpiInstanceMI*>(cmi); @@ -185,13 +185,14 @@ } CMPIStatus CmpiInstanceMI::driveSetInstance - (CMPIInstanceMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eCop, CMPIInstance* eInst, char* *properties) + (CMPIInstanceMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eCop, const CMPIInstance* eInst, + const char* *properties) { try { - CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - CmpiObjectPath cop(eCop); + CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + CmpiObjectPath cop((CMPIObjectPath*)eCop); CmpiInstance inst(eInst); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiInstanceMI* imi = dynamic_cast<CmpiInstanceMI*>(cmi); @@ -204,13 +205,13 @@ } CMPIStatus CmpiInstanceMI::driveDeleteInstance - (CMPIInstanceMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eCop) + (CMPIInstanceMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eCop) { try { - CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - CmpiObjectPath cop(eCop); + CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + CmpiObjectPath cop((CMPIObjectPath*)eCop); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiInstanceMI* imi = dynamic_cast<CmpiInstanceMI*>(cmi); return imi->deleteInstance @@ -222,13 +223,13 @@ } CMPIStatus CmpiInstanceMI::driveExecQuery - (CMPIInstanceMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eCop, char* language ,char* query) + (CMPIInstanceMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eCop, const char* language ,const char* query) { try { - CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - CmpiObjectPath cop(eCop); + CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + CmpiObjectPath cop((CMPIObjectPath*)eCop); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiInstanceMI* imi = dynamic_cast<CmpiInstanceMI*>(cmi); return imi->execQuery @@ -298,13 +299,13 @@ //--------------------------------------------------- CMPIStatus CmpiAssociationMI::driveAssociators - (CMPIAssociationMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eOp, const char* assocClass, const char* resultClass, - const char* role, const char* resultRole, char** properties) { + (CMPIAssociationMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eOp, const char* assocClass, const char* resultClass, + const char* role, const char* resultRole, const char** properties) { try { - CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - CmpiObjectPath cop(eOp); + CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + CmpiObjectPath cop((CMPIObjectPath*)eOp); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiAssociationMI* ami = dynamic_cast<CmpiAssociationMI*>(cmi); return ami->associators @@ -318,13 +319,13 @@ } CMPIStatus CmpiAssociationMI::driveAssociatorNames - (CMPIAssociationMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eOp, const char* assocClass, const char* resultClass, + (CMPIAssociationMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eOp, const char* assocClass, const char* resultClass, const char* role, const char* resultRole) { try { - CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - CmpiObjectPath cop(eOp); + CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + CmpiObjectPath cop((CMPIObjectPath*)eOp); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiAssociationMI* ami = dynamic_cast<CmpiAssociationMI*>(cmi); return ami->associatorNames @@ -338,13 +339,13 @@ } CMPIStatus CmpiAssociationMI::driveReferences - (CMPIAssociationMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eOp, const char* resultClass, const char* role , - char** properties) { + (CMPIAssociationMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eOp, const char* resultClass, const char* role , + const char** properties) { try { - CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - CmpiObjectPath cop(eOp); + CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + CmpiObjectPath cop((CMPIObjectPath*)eOp); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiAssociationMI* ami = dynamic_cast<CmpiAssociationMI*>(cmi); return ami->references @@ -357,12 +358,12 @@ } CMPIStatus CmpiAssociationMI::driveReferenceNames - (CMPIAssociationMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eOp, const char* resultClass, const char* role) { + (CMPIAssociationMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eOp, const char* resultClass, const char* role) { try { - CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - CmpiObjectPath cop(eOp); + CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + CmpiObjectPath cop((CMPIObjectPath*)eOp); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiAssociationMI* ami = dynamic_cast<CmpiAssociationMI*>(cmi); return ami->referenceNames @@ -420,15 +421,15 @@ //--------------------------------------------------- CMPIStatus CmpiMethodMI::driveInvokeMethod - (CMPIMethodMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eCop, const char* methodName, - CMPIArgs* eIn, CMPIArgs* eOut) + (CMPIMethodMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eCop, const char* methodName, + const CMPIArgs* eIn, CMPIArgs* eOut) { try { - const CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - const CmpiObjectPath cop(eCop); - const CmpiArgs in(eIn); + const CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + const CmpiObjectPath cop((CMPIObjectPath*)eCop); + const CmpiArgs in((CMPIArgs*)eIn); CmpiArgs out(eOut); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiMethodMI* mmi = dynamic_cast<CmpiMethodMI*>(cmi); @@ -470,12 +471,12 @@ } CMPIStatus CmpiPropertyMI::driveSetProperty - (CMPIPropertyMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eCop, char* name, CMPIData eData) { + (CMPIPropertyMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eCop, const char* name, CMPIData eData) { try { - const CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - const CmpiObjectPath cop(eCop); + const CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + const CmpiObjectPath cop((CMPIObjectPath*)eCop); const CmpiData data(eData); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiPropertyMI* pmi = dynamic_cast<CmpiPropertyMI*>(cmi); @@ -488,12 +489,12 @@ } CMPIStatus CmpiPropertyMI::driveGetProperty - (CMPIPropertyMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eCop, char* name) { + (CMPIPropertyMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eCop, const char* name) { try { - const CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - const CmpiObjectPath cop(eCop); + const CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + const CmpiObjectPath cop((CMPIObjectPath*)eCop); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiPropertyMI* pmi = dynamic_cast<CmpiPropertyMI*>(cmi); return pmi->getProperty @@ -535,13 +536,13 @@ } CMPIStatus CmpiIndicationMI::driveAuthorizeFilter - (CMPIIndicationMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPISelectExp* eSe, const char* ns, CMPIObjectPath* eCop, + (CMPIIndicationMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPISelectExp* eSe, const char* ns, const CMPIObjectPath* eCop, const char* user){ try { - const CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - const CmpiObjectPath cop(eCop); + const CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + const CmpiObjectPath cop((CMPIObjectPath*)eCop); const CmpiSelectExp se(eSe); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiIndicationMI* nmi = dynamic_cast<CmpiIndicationMI*>(cmi); @@ -554,12 +555,12 @@ } CMPIStatus CmpiIndicationMI::driveMustPoll - (CMPIIndicationMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPISelectExp* eSe, const char* ns, CMPIObjectPath* eCop){ + (CMPIIndicationMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPISelectExp* eSe, const char* ns, const CMPIObjectPath* eCop){ try { - const CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - const CmpiObjectPath cop(eCop); + const CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + const CmpiObjectPath cop((CMPIObjectPath*)eCop); const CmpiSelectExp se(eSe); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiIndicationMI* nmi = dynamic_cast<CmpiIndicationMI*>(cmi); @@ -572,13 +573,13 @@ } CMPIStatus CmpiIndicationMI::driveActivateFilter - (CMPIIndicationMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPISelectExp* eSe, const char* ns, CMPIObjectPath* eCop, + (CMPIIndicationMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPISelectExp* eSe, const char* ns, const CMPIObjectPath* eCop, CMPIBoolean first){ - const CmpiContext ctx(eCtx); + const CmpiContext ctx((CMPIContext*)eCtx); try { - CmpiResult rslt(eRslt); - const CmpiObjectPath cop(eCop); + CmpiResult rslt((CMPIResult*)eRslt); + const CmpiObjectPath cop((CMPIObjectPath*)eCop); const CmpiSelectExp se(eSe); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiIndicationMI* nmi = dynamic_cast<CmpiIndicationMI*>(cmi); @@ -591,13 +592,13 @@ } CMPIStatus CmpiIndicationMI::driveDeActivateFilter - (CMPIIndicationMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPISelectExp* eSe, const char* ns, CMPIObjectPath* eCop, - CMPIBoolean last){ + (CMPIIndicationMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPISelectExp* eSe, const char* ns, const CMPIObjectPath* eCop, + const CMPIBoolean last){ try { - const CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - const CmpiObjectPath cop(eCop); + const CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + const CmpiObjectPath cop((CMPIObjectPath*)eCop); const CmpiSelectExp se(eSe); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiIndicationMI* nmi = dynamic_cast<CmpiIndicationMI*>(cmi); @@ -1184,7 +1185,7 @@ CmpiObjectPath CmpiInstance::getObjectPath() const { CMPIStatus rc={CMPI_RC_OK,NULL}; - CmpiObjectPath cop(getEnc()->ft->getObjectPath(getEnc(),&rc)); + CmpiObjectPath cop((CMPIObjectPath*)getEnc()->ft->getObjectPath(getEnc(),&rc)); if (rc.rc!=CMPI_RC_OK) throw CmpiStatus(rc); return cop; } Index: ChangeLog =================================================================== RCS file: /cvsroot/sblim/cmpi-devel/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ChangeLog 10 May 2005 15:50:17 -0000 1.2 +++ ChangeLog 13 May 2005 14:31:42 -0000 1.3 @@ -1,3 +1,38 @@ +2005-05-13 <mih...@dy...> + + * CmpiImpl.cpp: + Bug 1201389: Fixed the implementation of the MI driver functions, + mainly function signatures and type casts. + + * CmpiAssociationMI.h: + Bug 1201389: Adapted driveXyz.. function signatures to fit new cmpift.h + declarations. + + * CmpiBaseMI.h: + Bug 1201389: Adapted driveXyz.. function signatures to fit new cmpift.h + declarations. + + * CmpiIndicationMI.h: + Bug 1201389: Adapted driveXyz.. function signatures to fit new cmpift.h + declarations. + + * CmpiInstanceMI.h: + Bug 1201389: Adapted driveXyz.. function signatures to fit new cmpift.h + declarations. + + * CmpiMethodMI.h: + Bug 1201389: Adapted driveXyz.. function signatures to fit new cmpift.h + declarations. + + * CmpiPropertyMI.h: + Bug 1201389: Adapted driveXyz.. function signatures to fit new cmpift.h + declarations. + + * cmpimacs.h: + Bug 1201389: Added typecasts in the MI factory macros to allow + clean compilation. + + 2005-05-10 <mih...@dy...> * CmpiImpl.cpp: Bug 1199111 Changed from setInstance to modifyInstance. |
Update of /cvsroot/sblim/cmpi-tests/cmpi-instancetest/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24748 Modified Files: TST_InstanceDefaults.001.ein.OK TST_InstanceDefaults.001.ein.xml TST_InstanceKeys.001.ein.xml TST_InstanceProperties.001.ein.OK TST_InstanceProperties.001.ein.xml TST_InstanceProperties.002.ein.xml 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.xml TST_InstanceProperties.007.ein.xml TST_InstanceProperties.CMClassPathIsA.OK Added Files: xmltest.sh Log Message: updated test file and added xmltest script to automate running them Index: TST_InstanceProperties.001.ein.xml =================================================================== RCS file: /cvsroot/sblim/cmpi-tests/cmpi-instancetest/test/TST_InstanceProperties.001.ein.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- TST_InstanceProperties.001.ein.xml 12 May 2005 04:39:10 -0000 1.1 +++ TST_InstanceProperties.001.ein.xml 12 May 2005 17:41:28 -0000 1.2 @@ -1,6 +1,16 @@ <?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> + <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> Index: TST_InstanceProperties.006.di.xml =================================================================== RCS file: /cvsroot/sblim/cmpi-tests/cmpi-instancetest/test/TST_InstanceProperties.006.di.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- TST_InstanceProperties.006.di.xml 12 May 2005 04:39:10 -0000 1.1 +++ TST_InstanceProperties.006.di.xml 12 May 2005 17:41:28 -0000 1.2 @@ -1,6 +1,23 @@ -<?xml version="1.0" encoding="utf-8" ?> +<?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> + <MESSAGE ID="4711" PROTOCOLVERSION="1.0"> + <SIMPLEREQ> + <IMETHODCALL NAME="DeleteInstance"> + <LOCALNAMESPACEPATH> + <NAMESPACE NAME="root"/> + <NAMESPACE NAME="cimv2"/> + </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> Index: TST_InstanceProperties.004.di.xml =================================================================== RCS file: /cvsroot/sblim/cmpi-tests/cmpi-instancetest/test/TST_InstanceProperties.004.di.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- TST_InstanceProperties.004.di.xml 12 May 2005 04:39:10 -0000 1.1 +++ TST_InstanceProperties.004.di.xml 12 May 2005 17:41:28 -0000 1.2 @@ -1,6 +1,23 @@ -<?xml version="1.0" encoding="utf-8" ?> +<?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> + <MESSAGE ID="4711" PROTOCOLVERSION="1.0"> + <SIMPLEREQ> + <IMETHODCALL NAME="DeleteInstance"> + <LOCALNAMESPACEPATH> + <NAMESPACE NAME="root"/> + <NAMESPACE NAME="cimv2"/> + </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: xmltest.sh --- #!/bin/sh _RC=0 # Check for wbemcat utility if ! which wbemcat > /dev/null; then echo "Cannot find wbemcat. Please check your PATH" exit 1 fi # Look for all *.xml test files and run them in sorted order (hence tests should be numbered) find -name "*.xml" | sort | while read _TESTXML; do _TEST=${_TESTXML%.xml} _TESTDIR=$( dirname $_TEST) _TESTOK=$_TEST.OK _TESTRESULT=$_TEST.result echo -n "Running test $_TESTXML ... " # Make sure we will be able to write the result file if [[ ! -w $_TESTDIR ]]; then echo "FAILED"; echo -e "\tCannot write to $_TESTDIR" continue fi # Remove any old test result file rm -f $_TESTRESULT # Send the test CIM-XML to the CIMOM and save the response, stripping off the http header wbemcat $_TESTXML | awk "{i++; if (i>7) print}" > $_TESTRESULT if [[ $? -ne 0 ]]; then echo "FAILED"; echo -e "\twbemcat failed to send CIM-XML request" _RC=1 continue fi # If we dont yet have the expected result file, then save this response as the expected result if [[ ! -f $_TESTOK ]]; then echo "OK"; echo -e "\tSaving response as $_TESTOK" mv $_TESTRESULT $_TESTOK # Compare the response XML against the expected XML for differences elif ! diff --brief $_TESTOK $_TESTRESULT > /dev/null; then echo "FAILED"; echo -e "\tCheck $_TESTRESULT for errors" _RC=1; continue # Got the expected response XML else echo "Passed" rm -f $_TESTRESULT fi done echo "Finished" exit $_RC Index: TST_InstanceProperties.004.di.OK =================================================================== RCS file: /cvsroot/sblim/cmpi-tests/cmpi-instancetest/test/TST_InstanceProperties.004.di.OK,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- TST_InstanceProperties.004.di.OK 12 May 2005 04:39:10 -0000 1.1 +++ TST_InstanceProperties.004.di.OK 12 May 2005 17:41:28 -0000 1.2 @@ -3,8 +3,8 @@ <MESSAGE ID="4711" PROTOCOLVERSION="1.0"> <SIMPLERSP> <IMETHODRESPONSE NAME="DeleteInstance"> -<IRETURNVALUE> -</IRETURNVALUE> +<ERROR CODE="6" DESCRIPTION="Requested instance not found"/> </IMETHODRESPONSE> </SIMPLERSP> </MESSAGE> +</CIM> Index: TST_InstanceProperties.003.ein.xml =================================================================== RCS file: /cvsroot/sblim/cmpi-tests/cmpi-instancetest/test/TST_InstanceProperties.003.ein.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- TST_InstanceProperties.003.ein.xml 12 May 2005 04:39:10 -0000 1.1 +++ TST_InstanceProperties.003.ein.xml 12 May 2005 17:41:28 -0000 1.2 @@ -1,6 +1,16 @@ <?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> + <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> Index: TST_InstanceProperties.002.ein.xml =================================================================== RCS file: /cvsroot/sblim/cmpi-tests/cmpi-instancetest/test/TST_InstanceProperties.002.ein.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- TST_InstanceProperties.002.ein.xml 12 May 2005 04:39:10 -0000 1.1 +++ TST_InstanceProperties.002.ein.xml 12 May 2005 17:41:28 -0000 1.2 @@ -1,6 +1,16 @@ <?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> + <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> Index: TST_InstanceProperties.005.di.xml =================================================================== RCS file: /cvsroot/sblim/cmpi-tests/cmpi-instancetest/test/TST_InstanceProperties.005.di.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- TST_InstanceProperties.005.di.xml 12 May 2005 04:39:10 -0000 1.1 +++ TST_InstanceProperties.005.di.xml 12 May 2005 17:41:28 -0000 1.2 @@ -1,6 +1,23 @@ -<?xml version="1.0" encoding="utf-8" ?> +<?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> + <MESSAGE ID="4711" PROTOCOLVERSION="1.0"> + <SIMPLEREQ> + <IMETHODCALL NAME="DeleteInstance"> + <LOCALNAMESPACEPATH> + <NAMESPACE NAME="root"/> + <NAMESPACE NAME="cimv2"/> + </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> Index: TST_InstanceProperties.CMClassPathIsA.OK =================================================================== RCS file: /cvsroot/sblim/cmpi-tests/cmpi-instancetest/test/TST_InstanceProperties.CMClassPathIsA.OK,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- TST_InstanceProperties.CMClassPathIsA.OK 12 May 2005 04:39:10 -0000 1.1 +++ TST_InstanceProperties.CMClassPathIsA.OK 12 May 2005 17:41:28 -0000 1.2 @@ -3,9 +3,7 @@ <MESSAGE ID="4711" PROTOCOLVERSION="1.0"> <SIMPLERSP> <METHODRESPONSE NAME="CMClassPathIsA"> -<RETURNVALUE> -<VALUE>TRUE</VALUE> -</RETURNVALUE> +<ERROR CODE="6" DESCRIPTION="Requested instance not found"/> </METHODRESPONSE> </SIMPLERSP> </MESSAGE> Index: TST_InstanceProperties.007.ein.xml =================================================================== RCS file: /cvsroot/sblim/cmpi-tests/cmpi-instancetest/test/TST_InstanceProperties.007.ein.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- TST_InstanceProperties.007.ein.xml 12 May 2005 04:39:10 -0000 1.1 +++ TST_InstanceProperties.007.ein.xml 12 May 2005 17:41:28 -0000 1.2 @@ -1,6 +1,16 @@ <?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> + <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> Index: TST_InstanceProperties.005.di.OK =================================================================== RCS file: /cvsroot/sblim/cmpi-tests/cmpi-instancetest/test/TST_InstanceProperties.005.di.OK,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- TST_InstanceProperties.005.di.OK 12 May 2005 04:39:10 -0000 1.1 +++ TST_InstanceProperties.005.di.OK 12 May 2005 17:41:28 -0000 1.2 @@ -3,8 +3,8 @@ <MESSAGE ID="4711" PROTOCOLVERSION="1.0"> <SIMPLERSP> <IMETHODRESPONSE NAME="DeleteInstance"> -<IRETURNVALUE> -</IRETURNVALUE> +<ERROR CODE="6" DESCRIPTION="Requested instance not found"/> </IMETHODRESPONSE> </SIMPLERSP> </MESSAGE> +</CIM> Index: TST_InstanceProperties.001.ein.OK =================================================================== RCS file: /cvsroot/sblim/cmpi-tests/cmpi-instancetest/test/TST_InstanceProperties.001.ein.OK,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- TST_InstanceProperties.001.ein.OK 12 May 2005 04:39:10 -0000 1.1 +++ TST_InstanceProperties.001.ein.OK 12 May 2005 17:41:28 -0000 1.2 @@ -4,22 +4,6 @@ <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> Index: TST_InstanceDefaults.001.ein.OK =================================================================== RCS file: /cvsroot/sblim/cmpi-tests/cmpi-instancetest/test/TST_InstanceDefaults.001.ein.OK,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- TST_InstanceDefaults.001.ein.OK 12 May 2005 04:39:10 -0000 1.1 +++ TST_InstanceDefaults.001.ein.OK 12 May 2005 17:41:27 -0000 1.2 @@ -24,3 +24,4 @@ </IMETHODRESPONSE> </SIMPLERSP> </MESSAGE> +</CIM> Index: TST_InstanceDefaults.001.ein.xml =================================================================== RCS file: /cvsroot/sblim/cmpi-tests/cmpi-instancetest/test/TST_InstanceDefaults.001.ein.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- TST_InstanceDefaults.001.ein.xml 12 May 2005 04:39:10 -0000 1.1 +++ TST_InstanceDefaults.001.ein.xml 12 May 2005 17:41:28 -0000 1.2 @@ -1,6 +1,16 @@ -<?xml version="1.0" encoding="utf-8" ?> +<?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> + <MESSAGE ID="4711" PROTOCOLVERSION="1.0"> + <SIMPLEREQ> + <IMETHODCALL NAME="EnumerateInstanceNames"> + <LOCALNAMESPACEPATH> + <NAMESPACE NAME="root"/> + <NAMESPACE NAME="cimv2"/> + </LOCALNAMESPACEPATH> + <IPARAMVALUE NAME="ClassName"> + <CLASSNAME NAME="TST_InstanceDefaults"/> + </IPARAMVALUE> + </IMETHODCALL> + </SIMPLEREQ> + </MESSAGE> +</CIM> Index: TST_InstanceKeys.001.ein.xml =================================================================== RCS file: /cvsroot/sblim/cmpi-tests/cmpi-instancetest/test/TST_InstanceKeys.001.ein.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- TST_InstanceKeys.001.ein.xml 12 May 2005 04:39:10 -0000 1.1 +++ TST_InstanceKeys.001.ein.xml 12 May 2005 17:41:28 -0000 1.2 @@ -1,6 +1,16 @@ <?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> + <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> |
|
From: Viktor M. <mih...@us...> - 2005-05-12 15:21:57
|
Update of /cvsroot/sblim/cmpi-fsvol In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24946 Modified Files: ChangeLog NEWS acinclude.m4 provider-register.sh Log Message: Bugs fixed: 1183805. Added support for OpenWBEM provider registration. Index: acinclude.m4 =================================================================== RCS file: /cvsroot/sblim/cmpi-fsvol/acinclude.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- acinclude.m4 15 Apr 2005 14:28:15 -0000 1.1 +++ acinclude.m4 12 May 2005 15:21:33 -0000 1.2 @@ -229,7 +229,8 @@ ) dnl -dnl The "check" for the CIM server type +dnl The "check" for the CIM server type in PATH and +dnl the sbin directories. dnl Sets the CIMSERVER variable. dnl @@ -237,6 +238,8 @@ [ AC_MSG_CHECKING(for CIM servers) _SERVERS="sfcbd cimserver owcimomd" + _SAVE_PATH=$PATH + PATH=/usr/sbin:/usr/local/sbin:$PATH for _name in $_SERVERS do AC_MSG_CHECKING( $_name ) @@ -254,6 +257,7 @@ break; fi done + PATH=$_SAVE_PATH if test x"$CIMSERVER" == x ; then CIMSERVER=sfcb AC_MSG_RESULT(implied: $CIMSERVER) Index: ChangeLog =================================================================== RCS file: /cvsroot/sblim/cmpi-fsvol/ChangeLog,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ChangeLog 11 May 2005 12:04:26 -0000 1.4 +++ ChangeLog 12 May 2005 15:21:33 -0000 1.5 @@ -1,3 +1,10 @@ +2005-05-12 <mih...@dy...> + + * provider-register.sh: Updated for OpenWBEM support. + + * acinclude.m4: Updated for OpenWBEM support. + + 2005-05-10 <mih...@dy...> * mof/Linux_Fsvol.registration: Bug 1199146 added missing Index: provider-register.sh =================================================================== RCS file: /cvsroot/sblim/cmpi-fsvol/provider-register.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- provider-register.sh 2 May 2005 15:50:07 -0000 1.2 +++ provider-register.sh 12 May 2005 15:21:33 -0000 1.3 @@ -414,13 +414,127 @@ done # "Unstage" MOFs and the registration file - chatter "Unstaging provider regsiatrations." + chatter "Unstaging provider registrations." sfcbunstage -r $baseregname.reg $mymofs # Rebuild repository sfcb_rebuild } +function openwbem_transform() +{ + OUTFILE=$1 + shift + moffiles=$* + + if rm -f $OUTFILE + then + for _f in $moffiles + do + sed "s/Provider *( *\"cmpi:/Provider(\"cmpi::/g" < $_f >> $OUTFILE + done + fi +} + +function openwbem_repository() +{ + for p in /var/lib/openwbem /usr/local/var/openwbem + do + if test -f $p/schema.dat + then + echo $p + return 0 + fi + done + return 1 +} + +function openwbem_install() +{ + CIMMOF=`which owmofc 2> /dev/null` + if test $? != 0 + then + echo "Error: cimmof not found" >&2 + return 1 + fi + + if ps -C owcimomd > /dev/null 2>&1 + then + state=active + else + CIMMOF="$CIMMOF -d `openwbem_repository`" + if test $? != 0 + then + echo "Error: OpenWBEM repository not found" >&2 + return 1 + fi + state=inactive + fi + + for _TEMPDIR in /var/tmp /tmp + do + if test -w $_TEMPDIR + then + _REGFILENAME=$_TEMPDIR/$$.mof + break + fi + done + + trap "rm -f $_REGFILENAME" EXIT + + if openwbem_transform $_REGFILENAME $* + then + chatter Registering providers with $state owcimomd + $CIMMOF $_REGFILENAME > /dev/null + else + echo "Failed to build OpenWBEM registration MOF." >&2 + return 1 + fi +} + +function openwbem_uninstall() +{ + CIMMOF=`which owmofc 2> /dev/null` + if test $? != 0 + then + echo "Error: cimmof not found" >&2 + return 1 + fi + + if ps -C owcimomd > /dev/null 2>&1 + then + state=active + else + CIMMOF="$CIMMOF -d `openwbem_repository`" + if test $? != 0 + then + echo "Error: OpenWBEM repository not found" >&2 + return 1 + fi + state=inactive + fi + + for _TEMPDIR in /var/tmp /tmp + do + if test -w $_TEMPDIR + then + _REGFILENAME=$_TEMPDIR/$$.mof + break + fi + done + + trap "rm -f $_REGFILENAME" EXIT + + if openwbem_transform $_REGFILENAME $* + then + chatter Deregistering providers with $state owcimomd + $CIMMOF -r $_REGFILENAME > /dev/null + else + echo "Failed to build OpenWBEM registration MOF." >&2 + return 1 + fi +} + function cim_server() { for exname in sfcbd cimserver owcimomd @@ -556,7 +670,7 @@ case $cimserver in pegasus) pegasus_install $mofs ":" $regs;; sfcb) sfcb_install $mofs ":" $regs;; - openwbem) echo openwbem not yet supported && exit 1 ;; + openwbem) openwbem_install $mofs ;; sniacimom) echo sniacimom not yet supported && exit 1 ;; **) echo "Invalid CIM Server Type " $cimserver && exit 1;; esac @@ -564,7 +678,7 @@ case $cimserver in pegasus) pegasus_uninstall $mofs ":" $regs;; sfcb) sfcb_uninstall $mofs ":" $regs;; - openwbem) echo openwbem not yet supported && exit 1 ;; + openwbem) openwbem_uninstall $mofs ;; sniacimom) echo sniacimom not yet supported && exit 1 ;; **) echo "Invalid CIM Server Type " $cimserver && exit 1;; esac Index: NEWS =================================================================== RCS file: /cvsroot/sblim/cmpi-fsvol/NEWS,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NEWS 11 May 2005 12:04:26 -0000 1.2 +++ NEWS 12 May 2005 15:21:33 -0000 1.3 @@ -4,3 +4,4 @@ Bugs: - 1199129 Added toleration for newer (spec-conforming) CMPI headers. - 1199146 Added missing registration for BlockDeviceStatisticalData. +- 1183805 Added support for OpenWBEM provider registration. |
|
From: Viktor M. <mih...@us...> - 2005-05-12 15:18:44
|
Update of /cvsroot/sblim/cmpi-network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24487 Modified Files: ChangeLog NEWS acinclude.m4 provider-register.sh Log Message: Bugs fixed: 1183805. Added support for OpenWBEM provider registration. Index: acinclude.m4 =================================================================== RCS file: /cvsroot/sblim/cmpi-network/acinclude.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- acinclude.m4 18 Apr 2005 12:06:56 -0000 1.1 +++ acinclude.m4 12 May 2005 15:18:35 -0000 1.2 @@ -229,7 +229,8 @@ ) dnl -dnl The "check" for the CIM server type +dnl The "check" for the CIM server type in PATH and +dnl the sbin directories. dnl Sets the CIMSERVER variable. dnl @@ -237,6 +238,8 @@ [ AC_MSG_CHECKING(for CIM servers) _SERVERS="sfcbd cimserver owcimomd" + _SAVE_PATH=$PATH + PATH=/usr/sbin:/usr/local/sbin:$PATH for _name in $_SERVERS do AC_MSG_CHECKING( $_name ) @@ -254,6 +257,7 @@ break; fi done + PATH=$_SAVE_PATH if test x"$CIMSERVER" == x ; then CIMSERVER=sfcb AC_MSG_RESULT(implied: $CIMSERVER) Index: ChangeLog =================================================================== RCS file: /cvsroot/sblim/cmpi-network/ChangeLog,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ChangeLog 11 May 2005 11:42:02 -0000 1.3 +++ ChangeLog 12 May 2005 15:18:35 -0000 1.4 @@ -1,3 +1,10 @@ +2005-05-12 <mih...@dy...> + + * provider-register.sh: Updated for OpenWBEM support. + + * acinclude.m4: Updated for OpenWBEM support. + + 2005-05-10 <mih...@dy...> * configure.ac: Bug 1199129: add -DCMPI_VERSION=90 to CPPFLAGS to Index: provider-register.sh =================================================================== RCS file: /cvsroot/sblim/cmpi-network/provider-register.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- provider-register.sh 4 May 2005 14:43:48 -0000 1.2 +++ provider-register.sh 12 May 2005 15:18:35 -0000 1.3 @@ -414,13 +414,127 @@ done # "Unstage" MOFs and the registration file - chatter "Unstaging provider regsiatrations." + chatter "Unstaging provider registrations." sfcbunstage -r $baseregname.reg $mymofs # Rebuild repository sfcb_rebuild } +function openwbem_transform() +{ + OUTFILE=$1 + shift + moffiles=$* + + if rm -f $OUTFILE + then + for _f in $moffiles + do + sed "s/Provider *( *\"cmpi:/Provider(\"cmpi::/g" < $_f >> $OUTFILE + done + fi +} + +function openwbem_repository() +{ + for p in /var/lib/openwbem /usr/local/var/openwbem + do + if test -f $p/schema.dat + then + echo $p + return 0 + fi + done + return 1 +} + +function openwbem_install() +{ + CIMMOF=`which owmofc 2> /dev/null` + if test $? != 0 + then + echo "Error: cimmof not found" >&2 + return 1 + fi + + if ps -C owcimomd > /dev/null 2>&1 + then + state=active + else + CIMMOF="$CIMMOF -d `openwbem_repository`" + if test $? != 0 + then + echo "Error: OpenWBEM repository not found" >&2 + return 1 + fi + state=inactive + fi + + for _TEMPDIR in /var/tmp /tmp + do + if test -w $_TEMPDIR + then + _REGFILENAME=$_TEMPDIR/$$.mof + break + fi + done + + trap "rm -f $_REGFILENAME" EXIT + + if openwbem_transform $_REGFILENAME $* + then + chatter Registering providers with $state owcimomd + $CIMMOF $_REGFILENAME > /dev/null + else + echo "Failed to build OpenWBEM registration MOF." >&2 + return 1 + fi +} + +function openwbem_uninstall() +{ + CIMMOF=`which owmofc 2> /dev/null` + if test $? != 0 + then + echo "Error: cimmof not found" >&2 + return 1 + fi + + if ps -C owcimomd > /dev/null 2>&1 + then + state=active + else + CIMMOF="$CIMMOF -d `openwbem_repository`" + if test $? != 0 + then + echo "Error: OpenWBEM repository not found" >&2 + return 1 + fi + state=inactive + fi + + for _TEMPDIR in /var/tmp /tmp + do + if test -w $_TEMPDIR + then + _REGFILENAME=$_TEMPDIR/$$.mof + break + fi + done + + trap "rm -f $_REGFILENAME" EXIT + + if openwbem_transform $_REGFILENAME $* + then + chatter Deregistering providers with $state owcimomd + $CIMMOF -r $_REGFILENAME > /dev/null + else + echo "Failed to build OpenWBEM registration MOF." >&2 + return 1 + fi +} + function cim_server() { for exname in sfcbd cimserver owcimomd @@ -556,7 +670,7 @@ case $cimserver in pegasus) pegasus_install $mofs ":" $regs;; sfcb) sfcb_install $mofs ":" $regs;; - openwbem) echo openwbem not yet supported && exit 1 ;; + openwbem) openwbem_install $mofs ;; sniacimom) echo sniacimom not yet supported && exit 1 ;; **) echo "Invalid CIM Server Type " $cimserver && exit 1;; esac @@ -564,7 +678,7 @@ case $cimserver in pegasus) pegasus_uninstall $mofs ":" $regs;; sfcb) sfcb_uninstall $mofs ":" $regs;; - openwbem) echo openwbem not yet supported && exit 1 ;; + openwbem) openwbem_uninstall $mofs ;; sniacimom) echo sniacimom not yet supported && exit 1 ;; **) echo "Invalid CIM Server Type " $cimserver && exit 1;; esac Index: NEWS =================================================================== RCS file: /cvsroot/sblim/cmpi-network/NEWS,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- NEWS 11 May 2005 11:42:02 -0000 1.3 +++ NEWS 12 May 2005 15:18:35 -0000 1.4 @@ -3,6 +3,7 @@ Bugs: - 1199129 Added toleration for newer (spec-conforming) CMPI headers. +- 1183805 Added support for OpenWBEM provider registration. Changes in 1.3.4 ================ |
|
From: Viktor M. <mih...@us...> - 2005-05-12 15:16:32
|
Update of /cvsroot/sblim/cmpi-samples/cmpi-fad In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24090 Modified Files: acinclude.m4 provider-register.sh Log Message: Bugs fixed: 1183805. Added support for OpenWBEM provider registration. Index: acinclude.m4 =================================================================== RCS file: /cvsroot/sblim/cmpi-samples/cmpi-fad/acinclude.m4,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- acinclude.m4 27 Apr 2005 12:02:56 -0000 1.5 +++ acinclude.m4 12 May 2005 15:16:23 -0000 1.6 @@ -242,7 +242,8 @@ ) dnl -dnl The "check" for the CIM server type +dnl The "check" for the CIM server type in PATH and +dnl the sbin directories. dnl Sets the CIMSERVER variable. dnl @@ -250,6 +251,8 @@ [ AC_MSG_CHECKING(for CIM servers) _SERVERS="sfcbd cimserver owcimomd" + _SAVE_PATH=$PATH + PATH=/usr/sbin:/usr/local/sbin:$PATH for _name in $_SERVERS do AC_MSG_CHECKING( $_name ) @@ -267,6 +270,7 @@ break; fi done + PATH=$_SAVE_PATH if test x"$CIMSERVER" == x ; then CIMSERVER=sfcb AC_MSG_RESULT(implied: $CIMSERVER) Index: provider-register.sh =================================================================== RCS file: /cvsroot/sblim/cmpi-samples/cmpi-fad/provider-register.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- provider-register.sh 28 Apr 2005 12:43:10 -0000 1.5 +++ provider-register.sh 12 May 2005 15:16:23 -0000 1.6 @@ -414,13 +414,127 @@ done # "Unstage" MOFs and the registration file - chatter "Unstaging provider regsiatrations." + chatter "Unstaging provider registrations." sfcbunstage -r $baseregname.reg $mymofs # Rebuild repository sfcb_rebuild } +function openwbem_transform() +{ + OUTFILE=$1 + shift + moffiles=$* + + if rm -f $OUTFILE + then + for _f in $moffiles + do + sed "s/Provider *( *\"cmpi:/Provider(\"cmpi::/g" < $_f >> $OUTFILE + done + fi +} + +function openwbem_repository() +{ + for p in /var/lib/openwbem /usr/local/var/openwbem + do + if test -f $p/schema.dat + then + echo $p + return 0 + fi + done + return 1 +} + +function openwbem_install() +{ + CIMMOF=`which owmofc 2> /dev/null` + if test $? != 0 + then + echo "Error: cimmof not found" >&2 + return 1 + fi + + if ps -C owcimomd > /dev/null 2>&1 + then + state=active + else + CIMMOF="$CIMMOF -d `openwbem_repository`" + if test $? != 0 + then + echo "Error: OpenWBEM repository not found" >&2 + return 1 + fi + state=inactive + fi + + for _TEMPDIR in /var/tmp /tmp + do + if test -w $_TEMPDIR + then + _REGFILENAME=$_TEMPDIR/$$.mof + break + fi + done + + trap "rm -f $_REGFILENAME" EXIT + + if openwbem_transform $_REGFILENAME $* + then + chatter Registering providers with $state owcimomd + $CIMMOF $_REGFILENAME > /dev/null + else + echo "Failed to build OpenWBEM registration MOF." >&2 + return 1 + fi +} + +function openwbem_uninstall() +{ + CIMMOF=`which owmofc 2> /dev/null` + if test $? != 0 + then + echo "Error: cimmof not found" >&2 + return 1 + fi + + if ps -C owcimomd > /dev/null 2>&1 + then + state=active + else + CIMMOF="$CIMMOF -d `openwbem_repository`" + if test $? != 0 + then + echo "Error: OpenWBEM repository not found" >&2 + return 1 + fi + state=inactive + fi + + for _TEMPDIR in /var/tmp /tmp + do + if test -w $_TEMPDIR + then + _REGFILENAME=$_TEMPDIR/$$.mof + break + fi + done + + trap "rm -f $_REGFILENAME" EXIT + + if openwbem_transform $_REGFILENAME $* + then + chatter Deregistering providers with $state owcimomd + $CIMMOF -r $_REGFILENAME > /dev/null + else + echo "Failed to build OpenWBEM registration MOF." >&2 + return 1 + fi +} + function cim_server() { for exname in sfcbd cimserver owcimomd @@ -556,7 +670,7 @@ case $cimserver in pegasus) pegasus_install $mofs ":" $regs;; sfcb) sfcb_install $mofs ":" $regs;; - openwbem) echo openwbem not yet supported && exit 1 ;; + openwbem) openwbem_install $mofs ;; sniacimom) echo sniacimom not yet supported && exit 1 ;; **) echo "Invalid CIM Server Type " $cimserver && exit 1;; esac @@ -564,7 +678,7 @@ case $cimserver in pegasus) pegasus_uninstall $mofs ":" $regs;; sfcb) sfcb_uninstall $mofs ":" $regs;; - openwbem) echo openwbem not yet supported && exit 1 ;; + openwbem) openwbem_uninstall $mofs ;; sniacimom) echo sniacimom not yet supported && exit 1 ;; **) echo "Invalid CIM Server Type " $cimserver && exit 1;; esac |
|
From: Viktor M. <mih...@us...> - 2005-05-12 15:15:31
|
Update of /cvsroot/sblim/cmpi-base In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23802 Modified Files: ChangeLog NEWS OSBase_OperatingSystem.c acinclude.m4 provider-register.sh Log Message: Bugs fixed: 1183805 1198184. Fixed release determination code. Added support for OpenWBEM provider registration. Index: acinclude.m4 =================================================================== RCS file: /cvsroot/sblim/cmpi-base/acinclude.m4,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- acinclude.m4 27 Apr 2005 09:17:46 -0000 1.7 +++ acinclude.m4 12 May 2005 15:15:07 -0000 1.8 @@ -242,7 +242,8 @@ ) dnl -dnl The "check" for the CIM server type +dnl The "check" for the CIM server type in PATH and +dnl the sbin directories. dnl Sets the CIMSERVER variable. dnl @@ -250,6 +251,8 @@ [ AC_MSG_CHECKING(for CIM servers) _SERVERS="sfcbd cimserver owcimomd" + _SAVE_PATH=$PATH + PATH=/usr/sbin:/usr/local/sbin:$PATH for _name in $_SERVERS do AC_MSG_CHECKING( $_name ) @@ -267,6 +270,7 @@ break; fi done + PATH=$_SAVE_PATH if test x"$CIMSERVER" == x ; then CIMSERVER=sfcb AC_MSG_RESULT(implied: $CIMSERVER) Index: ChangeLog =================================================================== RCS file: /cvsroot/sblim/cmpi-base/ChangeLog,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ChangeLog 11 May 2005 14:00:44 -0000 1.7 +++ ChangeLog 12 May 2005 15:15:07 -0000 1.8 @@ -1,3 +1,13 @@ +2005-05-12 <mih...@dy...> + + * provider-register.sh: Updated for OpenWBEM support. + + * acinclude.m4: Updated for OpenWBEM support. + + * OSBase_OperatingSystem.c: + Bug 1198184: Enhanced the release determination logic to ignore + directories in /etc . + 2005-05-11 <mih...@dy...> * cmpiOSBase_OperatingSystemProvider.c: Index: OSBase_OperatingSystem.c =================================================================== RCS file: /cvsroot/sblim/cmpi-base/OSBase_OperatingSystem.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- OSBase_OperatingSystem.c 3 Mar 2005 13:52:35 -0000 1.17 +++ OSBase_OperatingSystem.c 12 May 2005 15:15:07 -0000 1.18 @@ -133,7 +133,7 @@ _OSBASE_TRACE(4,("--- get_os_distro() called : init")); - rc = runcommand( "cat `find /etc/ -name *release* 2>/dev/null`" , NULL , &hdout , NULL ); + rc = runcommand( "cat `find /etc/ -type f -maxdepth 1 -name *release* 2>/dev/null`" , NULL , &hdout , NULL ); if( rc == 0 ) { while ( hdout[i]) { strl = strl+strlen(hdout[i])+1; Index: provider-register.sh =================================================================== RCS file: /cvsroot/sblim/cmpi-base/provider-register.sh,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- provider-register.sh 28 Apr 2005 12:36:48 -0000 1.6 +++ provider-register.sh 12 May 2005 15:15:07 -0000 1.7 @@ -414,13 +414,127 @@ done # "Unstage" MOFs and the registration file - chatter "Unstaging provider regsiatrations." + chatter "Unstaging provider registrations." sfcbunstage -r $baseregname.reg $mymofs # Rebuild repository sfcb_rebuild } +function openwbem_transform() +{ + OUTFILE=$1 + shift + moffiles=$* + + if rm -f $OUTFILE + then + for _f in $moffiles + do + sed "s/Provider *( *\"cmpi:/Provider(\"cmpi::/g" < $_f >> $OUTFILE + done + fi +} + +function openwbem_repository() +{ + for p in /var/lib/openwbem /usr/local/var/openwbem + do + if test -f $p/schema.dat + then + echo $p + return 0 + fi + done + return 1 +} + +function openwbem_install() +{ + CIMMOF=`which owmofc 2> /dev/null` + if test $? != 0 + then + echo "Error: cimmof not found" >&2 + return 1 + fi + + if ps -C owcimomd > /dev/null 2>&1 + then + state=active + else + CIMMOF="$CIMMOF -d `openwbem_repository`" + if test $? != 0 + then + echo "Error: OpenWBEM repository not found" >&2 + return 1 + fi + state=inactive + fi + + for _TEMPDIR in /var/tmp /tmp + do + if test -w $_TEMPDIR + then + _REGFILENAME=$_TEMPDIR/$$.mof + break + fi + done + + trap "rm -f $_REGFILENAME" EXIT + + if openwbem_transform $_REGFILENAME $* + then + chatter Registering providers with $state owcimomd + $CIMMOF $_REGFILENAME > /dev/null + else + echo "Failed to build OpenWBEM registration MOF." >&2 + return 1 + fi +} + +function openwbem_uninstall() +{ + CIMMOF=`which owmofc 2> /dev/null` + if test $? != 0 + then + echo "Error: cimmof not found" >&2 + return 1 + fi + + if ps -C owcimomd > /dev/null 2>&1 + then + state=active + else + CIMMOF="$CIMMOF -d `openwbem_repository`" + if test $? != 0 + then + echo "Error: OpenWBEM repository not found" >&2 + return 1 + fi + state=inactive + fi + + for _TEMPDIR in /var/tmp /tmp + do + if test -w $_TEMPDIR + then + _REGFILENAME=$_TEMPDIR/$$.mof + break + fi + done + + trap "rm -f $_REGFILENAME" EXIT + + if openwbem_transform $_REGFILENAME $* + then + chatter Deregistering providers with $state owcimomd + $CIMMOF -r $_REGFILENAME > /dev/null + else + echo "Failed to build OpenWBEM registration MOF." >&2 + return 1 + fi +} + function cim_server() { for exname in sfcbd cimserver owcimomd @@ -556,7 +670,7 @@ case $cimserver in pegasus) pegasus_install $mofs ":" $regs;; sfcb) sfcb_install $mofs ":" $regs;; - openwbem) echo openwbem not yet supported && exit 1 ;; + openwbem) openwbem_install $mofs ;; sniacimom) echo sniacimom not yet supported && exit 1 ;; **) echo "Invalid CIM Server Type " $cimserver && exit 1;; esac @@ -564,7 +678,7 @@ case $cimserver in pegasus) pegasus_uninstall $mofs ":" $regs;; sfcb) sfcb_uninstall $mofs ":" $regs;; - openwbem) echo openwbem not yet supported && exit 1 ;; + openwbem) openwbem_uninstall $mofs ;; sniacimom) echo sniacimom not yet supported && exit 1 ;; **) echo "Invalid CIM Server Type " $cimserver && exit 1;; esac Index: NEWS =================================================================== RCS file: /cvsroot/sblim/cmpi-base/NEWS,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- NEWS 11 May 2005 14:00:44 -0000 1.3 +++ NEWS 12 May 2005 15:15:07 -0000 1.4 @@ -1,6 +1,8 @@ Changes in 1.5.1 ================ -Bugs: +Bugs Fixed: - 1199129 Added toleration for newer (spec-conforming) CMPI headers. - 1199449 Fixed compile problem with new indication_helper 0.4.0 . +- 1198184 Fixed release determination logic. +- 1183805 Added support for OpenWBEM provider registration. |
|
From: Viktor M. <mih...@us...> - 2005-05-12 15:10:16
|
Update of /cvsroot/sblim/cmpi-samples/autotools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21960 Modified Files: acinclude.m4 provider-register.sh Log Message: Bug 1191544 addendum: Update to support OpenWBEM. Index: acinclude.m4 =================================================================== RCS file: /cvsroot/sblim/cmpi-samples/autotools/acinclude.m4,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- acinclude.m4 20 Apr 2005 06:21:15 -0000 1.4 +++ acinclude.m4 12 May 2005 15:10:07 -0000 1.5 @@ -242,7 +242,8 @@ ) dnl -dnl The "check" for the CIM server type +dnl The "check" for the CIM server type in PATH and +dnl the sbin directories. dnl Sets the CIMSERVER variable. dnl @@ -250,6 +251,8 @@ [ AC_MSG_CHECKING(for CIM servers) _SERVERS="sfcbd cimserver owcimomd" + _SAVE_PATH=$PATH + PATH=/usr/sbin:/usr/local/sbin:$PATH for _name in $_SERVERS do AC_MSG_CHECKING( $_name ) @@ -267,6 +270,7 @@ break; fi done + PATH=$_SAVE_PATH if test x"$CIMSERVER" == x ; then CIMSERVER=sfcb AC_MSG_RESULT(implied: $CIMSERVER) Index: provider-register.sh =================================================================== RCS file: /cvsroot/sblim/cmpi-samples/autotools/provider-register.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- provider-register.sh 28 Apr 2005 12:43:10 -0000 1.4 +++ provider-register.sh 12 May 2005 15:10:07 -0000 1.5 @@ -414,13 +414,127 @@ done # "Unstage" MOFs and the registration file - chatter "Unstaging provider regsiatrations." + chatter "Unstaging provider registrations." sfcbunstage -r $baseregname.reg $mymofs # Rebuild repository sfcb_rebuild } +function openwbem_transform() +{ + OUTFILE=$1 + shift + moffiles=$* + + if rm -f $OUTFILE + then + for _f in $moffiles + do + sed "s/Provider *( *\"cmpi:/Provider(\"cmpi::/g" < $_f >> $OUTFILE + done + fi +} + +function openwbem_repository() +{ + for p in /var/lib/openwbem /usr/local/var/openwbem + do + if test -f $p/schema.dat + then + echo $p + return 0 + fi + done + return 1 +} + +function openwbem_install() +{ + CIMMOF=`which owmofc 2> /dev/null` + if test $? != 0 + then + echo "Error: cimmof not found" >&2 + return 1 + fi + + if ps -C owcimomd > /dev/null 2>&1 + then + state=active + else + CIMMOF="$CIMMOF -d `openwbem_repository`" + if test $? != 0 + then + echo "Error: OpenWBEM repository not found" >&2 + return 1 + fi + state=inactive + fi + + for _TEMPDIR in /var/tmp /tmp + do + if test -w $_TEMPDIR + then + _REGFILENAME=$_TEMPDIR/$$.mof + break + fi + done + + trap "rm -f $_REGFILENAME" EXIT + + if openwbem_transform $_REGFILENAME $* + then + chatter Registering providers with $state owcimomd + $CIMMOF $_REGFILENAME > /dev/null + else + echo "Failed to build OpenWBEM registration MOF." >&2 + return 1 + fi +} + +function openwbem_uninstall() +{ + CIMMOF=`which owmofc 2> /dev/null` + if test $? != 0 + then + echo "Error: cimmof not found" >&2 + return 1 + fi + + if ps -C owcimomd > /dev/null 2>&1 + then + state=active + else + CIMMOF="$CIMMOF -d `openwbem_repository`" + if test $? != 0 + then + echo "Error: OpenWBEM repository not found" >&2 + return 1 + fi + state=inactive + fi + + for _TEMPDIR in /var/tmp /tmp + do + if test -w $_TEMPDIR + then + _REGFILENAME=$_TEMPDIR/$$.mof + break + fi + done + + trap "rm -f $_REGFILENAME" EXIT + + if openwbem_transform $_REGFILENAME $* + then + chatter Deregistering providers with $state owcimomd + $CIMMOF -r $_REGFILENAME > /dev/null + else + echo "Failed to build OpenWBEM registration MOF." >&2 + return 1 + fi +} + function cim_server() { for exname in sfcbd cimserver owcimomd @@ -556,7 +670,7 @@ case $cimserver in pegasus) pegasus_install $mofs ":" $regs;; sfcb) sfcb_install $mofs ":" $regs;; - openwbem) echo openwbem not yet supported && exit 1 ;; + openwbem) openwbem_install $mofs ;; sniacimom) echo sniacimom not yet supported && exit 1 ;; **) echo "Invalid CIM Server Type " $cimserver && exit 1;; esac @@ -564,7 +678,7 @@ case $cimserver in pegasus) pegasus_uninstall $mofs ":" $regs;; sfcb) sfcb_uninstall $mofs ":" $regs;; - openwbem) echo openwbem not yet supported && exit 1 ;; + openwbem) openwbem_uninstall $mofs ;; sniacimom) echo sniacimom not yet supported && exit 1 ;; **) echo "Invalid CIM Server Type " $cimserver && exit 1;; esac |
|
From: Benjamin B. <bg...@us...> - 2005-05-12 15:09:59
|
Update of /cvsroot/sblim/ecute/InstallShield55/ecute In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22689/InstallShield55/ecute Modified Files: ecute.ipr Log Message: New InstallShield routine for ECUTE version 2.1 beta 1 Index: ecute.ipr =================================================================== RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/ecute.ipr,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ecute.ipr 8 Apr 2005 08:34:30 -0000 1.3 +++ ecute.ipr 12 May 2005 15:09:49 -0000 1.4 @@ -22,11 +22,11 @@ Type=Software Development Application Author= HomeURL= -InstallRoot=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute +InstallRoot=D:\workspace\ecute\InstallShield55\ecute UpdateURL=http:// set_level=Level 3 InstallationGUID=8a73b06f-31be-450a-b11e-ba9d2779550c -Version=2.01.006 +Version=2.01.007 set_miffile=Status.mif set_args= set_maxerr=50 @@ -47,7 +47,6 @@ [MediaInfo] mediadata0=Default/Media\Default -mediadata1=New Media/Media\New Media [General] PassData= |
|
From: Benjamin B. <bg...@us...> - 2005-05-12 15:09:57
|
Update of /cvsroot/sblim/ecute In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22689 Modified Files: .classpath build.xml Log Message: New InstallShield routine for ECUTE version 2.1 beta 1 Index: .classpath =================================================================== RCS file: /cvsroot/sblim/ecute/.classpath,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- .classpath 14 Feb 2005 17:38:06 -0000 1.13 +++ .classpath 12 May 2005 15:09:48 -0000 1.14 @@ -2,35 +2,40 @@ <classpath> <classpathentry kind="src" path="Plugin"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="lib" path="/home/kieningr/rsa-ecute-jars/common.jar"/> - <classpathentry kind="lib" path="/home/kieningr/rsa-ecute-jars/commonuiproperties.jar"/> - <classpathentry kind="lib" path="/home/kieningr/rsa-ecute-jars/ecore.jar"/> - <classpathentry kind="lib" path="/home/kieningr/rsa-ecute-jars/ecore.xmi.jar"/> - <classpathentry kind="lib" path="/home/kieningr/rsa-ecute-jars/emfmsl.jar"/> - <classpathentry kind="lib" path="/home/kieningr/rsa-ecute-jars/emfquery.jar"/> - <classpathentry kind="lib" path="/home/kieningr/rsa-ecute-jars/forms.jar"/> - <classpathentry kind="lib" path="/home/kieningr/rsa-ecute-jars/ide.jar"/> - <classpathentry kind="lib" path="/home/kieningr/rsa-ecute-jars/jface.jar"/> - <classpathentry kind="lib" path="/home/kieningr/rsa-ecute-jars/modeler.jar"/> - <classpathentry kind="lib" path="/home/kieningr/rsa-ecute-jars/modelerviews.jar"/> - <classpathentry kind="lib" path="/home/kieningr/rsa-ecute-jars/modelerwizards.jar"/> - <classpathentry kind="lib" path="/home/kieningr/rsa-ecute-jars/mslcore.jar"/> - <classpathentry kind="lib" path="/home/kieningr/rsa-ecute-jars/notation.jar"/> - <classpathentry kind="lib" path="/home/kieningr/rsa-ecute-jars/osgi.jar"/> - <classpathentry kind="lib" path="/home/kieningr/rsa-ecute-jars/presentation.jar"/> - <classpathentry kind="lib" path="/home/kieningr/rsa-ecute-jars/properties.jar"/> - <classpathentry kind="lib" path="/home/kieningr/rsa-ecute-jars/resources.jar"/> - <classpathentry kind="lib" path="/home/kieningr/rsa-ecute-jars/runtime.jar"/> - <classpathentry kind="lib" path="/home/kieningr/rsa-ecute-jars/swt.jar"/> - <classpathentry kind="lib" path="/home/kieningr/rsa-ecute-jars/ui.jar"/> - <classpathentry kind="lib" path="/home/kieningr/rsa-ecute-jars/uml2.jar"/> - <classpathentry kind="lib" path="/home/kieningr/rsa-ecute-jars/uml2msl.jar"/> - <classpathentry kind="lib" path="/home/kieningr/rsa-ecute-jars/umlcore.jar"/> - <classpathentry kind="lib" path="/home/kieningr/rsa-ecute-jars/umldiagram.jar"/> - <classpathentry kind="lib" path="/home/kieningr/rsa-ecute-jars/umlnotation.jar"/> - <classpathentry kind="lib" path="/home/kieningr/rsa-ecute-jars/umlui.jar"/> - <classpathentry kind="lib" path="/home/kieningr/rsa-ecute-jars/workbench.jar"/> - <classpathentry kind="lib" path="/home/kieningr/rsa-ecute-jars/xtoolscore.jar"/> - <classpathentry kind="lib" path="/opt/IBM/Ecute.tmp/jacob/jacob.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/xtoolsui.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/common.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/commonuiproperties.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/ecore.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/ecore.xmi.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/emfmsl.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/emfquery.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/forms.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/ide.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/jface.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/modeler.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/modelerviews.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/modelerwizards.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/mslcore.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/notation.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/osgi.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/presentation.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/properties.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/qname.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/resources.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/runtime.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/swt.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/ui.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/uml2.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/uml2msl.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/umlcore.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/umldiagram.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/umlnotation.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/umlui.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/workbench.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/wsdl4j.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/xsd.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/xsd.resources.jar"/> + <classpathentry kind="lib" path="D:/rsa-ecute-jars/xtoolscore.jar"/> + <classpathentry kind="lib" path="D:/jacob/jacob_1.8/jacob.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Index: build.xml =================================================================== RCS file: /cvsroot/sblim/ecute/build.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- build.xml 28 Dec 2004 12:33:40 -0000 1.5 +++ build.xml 12 May 2005 15:09:48 -0000 1.6 @@ -4,8 +4,8 @@ <!-- If any from the following paths are not present Ecute will be constructed without Rose plugins--> - <property name="jacobPath" location="D:\Program Files\IBM\Ecute\jacob\jacob.jar"/> - <property name="RoseFrameworks" location="D:\Program Files\Rational\Rose\framework\frameworks"/> + <property name="jacobPath" location="D:\jacob\jacob_1.8\jacob.jar"/> + <property name="RoseFrameworks" location="C:\Program Files\Rational\Rose\framework\frameworks"/> <!-- End of personalized configuration --> |
|
From: Benjamin B. <bg...@us...> - 2005-05-12 15:09:57
|
Update of /cvsroot/sblim/ecute/InstallShield55/ecute/Setup Files/Compressed Files/Language Independent/OS Independent In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22689/InstallShield55/ecute/Setup Files/Compressed Files/Language Independent/OS Independent Added Files: jacob.txt Download jacob_18.zip.url Log Message: New InstallShield routine for ECUTE version 2.1 beta 1 --- NEW FILE: jacob.txt --- ECUTE uses the JACOB open source project. The remainder of the installation will download the JACOB binary. By pressing "Yes", the JACOB binary will be downloaded from the JACOB web site. An explorer window will open, asking you to save the file jacob_18.zip. Please save it to the installation directory of ECUTE. If you are not sure whether you should do this, or if you are not connected to the Internet, press "No" now. This will skip the JACOB download but will complete the remainder of the installation. You will then need to download the JACOB binary manually. For your convenience, an Internet shortcut "Download jacob_18.zip" has been created in the installation directory. Download JACOB by double clicking the shortcut when connected to the Internet. Save the jacob_18.zip file to the installation directory of ECUTE. In any case, the first usage of ECUTE in ROse will extract the necessary files from the JACOB .zip file. --- NEW FILE: Download jacob_18.zip.url --- [InternetShortcut] URL=http://easynews.dl.sourceforge.net/sourceforge/jacob-project/jacob_18.zip Modified=60E5D0FE513BC50165 |
|
From: Viktor M. <mih...@us...> - 2005-05-12 09:05:42
|
Update of /cvsroot/sblim/wbemcli In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2428 Modified Files: ChangeLog CimCurl.cpp NEWS configure.ac Log Message: Bug 1200421: suppress Accept header to allow interoperation with OW 3.1.0. Index: NEWS =================================================================== RCS file: /cvsroot/sblim/wbemcli/NEWS,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NEWS 6 Dec 2004 17:21:19 -0000 1.2 +++ NEWS 12 May 2005 09:05:17 -0000 1.3 @@ -1,5 +1,15 @@ SBLIM WBEMCLI NEWS +Changes in Version 1.4.10 +========================= +Bugs: +- 1200421 Fix for Interoperability Problem with OpenWBEM. + +Changes in Version 1.4.9 +======================== +Bugs: +- Fix for slowdown and instabilities in conjunction with sfcb. + Version 1.4.8 - 12/06/2004 (Philip K. Warren) Support for libcurl and https URLs added. Index: configure.ac =================================================================== RCS file: /cvsroot/sblim/wbemcli/configure.ac,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- configure.ac 2 May 2005 14:06:57 -0000 1.8 +++ configure.ac 12 May 2005 09:05:17 -0000 1.9 @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_INIT(SBLIM WBEMCLI, 1.4.9, sbl...@ww...) +AC_INIT(SBLIM WBEMCLI, 1.4.10, sbl...@li...) AC_CONFIG_SRCDIR([CimXml.cpp]) AC_CANONICAL_HOST Index: ChangeLog =================================================================== RCS file: /cvsroot/sblim/wbemcli/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ChangeLog 2 May 2005 14:06:52 -0000 1.2 +++ ChangeLog 12 May 2005 09:05:17 -0000 1.3 @@ -1,3 +1,9 @@ +2005-05-12 <mih...@dy...> + + * CimCurl.cpp: + Bug 1200421: Suppress Accept header generation as OpenWBEM + 3.1.0 doesn't like it. + 2005-05-02 <mih...@dy...> * CimCurl.cpp: Suppress Expected Header as this slows down the Index: CimCurl.cpp =================================================================== RCS file: /cvsroot/sblim/wbemcli/CimCurl.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- CimCurl.cpp 2 May 2005 14:06:53 -0000 1.4 +++ CimCurl.cpp 12 May 2005 09:05:17 -0000 1.5 @@ -23,10 +23,11 @@ // These are the constant headers added to all requests static const char *headers[] = { - "Content-type: application/xml; charset=\"utf-8\"", + "Content-Type: application/xml; charset=\"utf-8\"", "Connection: Keep-Alive, TE", "CIMProtocolVersion: 1.0", "CIMOperation: MethodCall", + "Accept:", "Expect:" }; #define NUM_HEADERS ((sizeof(headers))/(sizeof(headers[0]))) |
|
From: Benjamin B. <bg...@us...> - 2005-05-12 07:52:53
|
Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23070/Plugin/com/ibm/ecute/utils Modified Files: Constants.java Log Message: Version 2.1 beta1 Index: Constants.java =================================================================== RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/utils/Constants.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Constants.java 10 May 2005 09:11:53 -0000 1.9 +++ Constants.java 12 May 2005 07:52:44 -0000 1.10 @@ -22,8 +22,8 @@ public class Constants { - public static final String pluginVersion="2.1 alpha 6d"; - public static final String toolName="eCUTE"; + public static final String pluginVersion="2.1 beta 1"; + public static final String toolName="ECUTE"; public static final String qualifiersFileName="QualifiersList.txt"; public static final String cimMOFInputPackageName = "CIMMOFInput"; |
|
From: Benjamin B. <bg...@us...> - 2005-05-12 07:50:20
|
Update of /cvsroot/sblim/ecute/Plugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22703/Plugin Removed Files: Download jacobBin_17.zip.url Log Message: jacob link renamed --- Download jacobBin_17.zip.url DELETED --- |
