sblim-commit — CVS Commit Info for SBLIM

[Sblim-commit] sfcc/man/man3 CMCIClient.3,NONE,1.1 CMCIClientFT.associatorNames.3,NONE,1.1 CMCIClientFT.associators.3,NONE,1.1 CMCIClientFT.createInstance.3,NONE,1.1 CMCIClientFT.deleteInstance.3,NONE,1.1 CMCIClientFT.enumClassNames.3,NONE,1.1 CMCIClientFT.enumClasses.3,NONE,1.1 CMCIClientFT.enumInstanceNames.3,NONE,1.1 CMCIClientFT.enumInstances.3,NONE,1.1 CMCIClientFT.execQuery.3,NONE,1.1 CMCIClientFT.getClass.3,NONE,1.1 CMCIClientFT.getInstance.3,NONE,1.1 CMCIClientFT.getProperty.3,NONE,1.1 CMCIClientFT.invokeMethod.3,NONE,1.1 CMCIClientFT.referenceNames.3,NONE,1.1 CMCIClientFT.references.3,NONE,1.1 CMCIClientFT.setInstance.3,NONE,1.1 CMCIClientFT.setProperty.3,NONE,1.1 CMPIArgs.3,NONE,1.1 CMPIEnumeration.3,NONE,1.1 CMPIInstance.3,NONE,1.1 CMPIObjectPath.3,NONE,1.1 CMPIStatus.3,NONE,1.1 CMPIString.3,NONE,1.1 CMPIValue.3,NONE,1.1 cmciConnect.3,NONE,1.1

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

Update of /cvsroot/sblim/sfcc/man/man3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2810

Added Files:
	CMCIClient.3 CMCIClientFT.associatorNames.3 
	CMCIClientFT.associators.3 CMCIClientFT.createInstance.3 
	CMCIClientFT.deleteInstance.3 CMCIClientFT.enumClassNames.3 
	CMCIClientFT.enumClasses.3 CMCIClientFT.enumInstanceNames.3 
	CMCIClientFT.enumInstances.3 CMCIClientFT.execQuery.3 
	CMCIClientFT.getClass.3 CMCIClientFT.getInstance.3 
	CMCIClientFT.getProperty.3 CMCIClientFT.invokeMethod.3 
	CMCIClientFT.referenceNames.3 CMCIClientFT.references.3 
	CMCIClientFT.setInstance.3 CMCIClientFT.setProperty.3 
	CMPIArgs.3 CMPIEnumeration.3 CMPIInstance.3 CMPIObjectPath.3 
	CMPIStatus.3 CMPIString.3 CMPIValue.3 cmciConnect.3 
Log Message:
added man pages


--- NEW FILE: CMCIClient.3 ---
.TH  3  2005-06-09 "sfcc" "SFCBroker Client Library"
.SH NAME
CMCIClient \- CIMOM Client Library object
.SH SYNOPSIS
.nf
.PP
\fC#include <cmci.h>\fP
.PP
.SS "Public Attributes"
.in +1c
.ti -1c
.RI "void * \fBhdl\fP"
.br
.RI "\fIOpaque pointer to specific implementation data. \fP"
.br
.ti -1c
.RI "\fBCMCIClientFT\fP * \fBft\fP"
.br
.RI "\fIPointer to the Args Function Table. \fP"
.SH "Class methods"
.br
.ti -1c
.RI "\fBCMPIEnumeration\fP * \fBenumInstanceNames\fP (\fBCMCIClient\fP *mb, \fBCMPIObjectPath\fP *cop, \fBCMPIStatus\fP *rc)"
.br
.ti -1c
.RI "\fBCMPIInstance\fP * \fBgetInstance\fP (\fBCMCIClient\fP *mb, \fBCMPIObjectPath\fP *cop, \fBCMPIFlags\fP flags, char **properties, \fBCMPIStatus\fP *rc)"
.br
.ti -1c
.RI "\fBCMPIObjectPath\fP * \fBcreateInstance\fP (\fBCMCIClient\fP *mb, \fBCMPIObjectPath\fP *cop, \fBCMPIInstance\fP *inst, \fBCMPIStatus\fP *rc)"
.br
.ti -1c
.RI "\fBCMPIStatus\fP \fBsetInstance\fP (\fBCMCIClient\fP *mb, \fBCMPIObjectPath\fP *cop, \fBCMPIInstance\fP *inst, \fBCMPIFlags\fP flags, char **properties)"
.br
.ti -1c
.RI "\fBCMPIStatus\fP \fBdeleteInstance\fP (\fBCMCIClient\fP *mb, \fBCMPIObjectPath\fP *cop)"
.br
.ti -1c
.RI "\fBCMPIEnumeration\fP * \fBexecQuery\fP (\fBCMCIClient\fP *mb, \fBCMPIObjectPath\fP *cop, const char *query, const char *lang, \fBCMPIStatus\fP *rc)"
.br
.ti -1c
.RI "\fBCMPIEnumeration\fP * \fBenumInstances\fP (\fBCMCIClient\fP *mb, \fBCMPIObjectPath\fP *cop, \fBCMPIFlags\fP flags, char **properties, \fBCMPIStatus\fP *rc)"
.br
.ti -1c
.RI "\fBCMPIEnumeration\fP * \fBassociators\fP (\fBCMCIClient\fP *mb, \fBCMPIObjectPath\fP *cop, const char *assocClass, const char *resultClass, const char *role, const char *resultRole, \fBCMPIFlags\fP flags, char **properties, \fBCMPIStatus\fP *rc)"
.br
.ti -1c
.RI "\fBCMPIEnumeration\fP * \fBassociatorNames\fP (\fBCMCIClient\fP *mb, \fBCMPIObjectPath\fP *cop, const char *assocClass, const char *resultClass, const char *role, const char *resultRole, \fBCMPIStatus\fP *rc)"
.br
.ti -1c
.RI "\fBCMPIEnumeration\fP * \fBreferences\fP (\fBCMCIClient\fP *mb, \fBCMPIObjectPath\fP *cop, const char *resultClass, const char *role, \fBCMPIFlags\fP flags, char **properties, \fBCMPIStatus\fP *rc)"
.br
.ti -1c
.RI "\fBCMPIEnumeration\fP * \fBreferenceNames\fP (\fBCMCIClient\fP *mb, \fBCMPIObjectPath\fP *cop, const char *resultClass, const char *role, \fBCMPIStatus\fP *rc)"
.br
.ti -1c
.RI "\fBCMPIData\fP \fBinvokeMethod\fP (\fBCMCIClient\fP *mb, \fBCMPIObjectPath\fP *cop, const char *method, \fBCMPIArgs\fP *in, \fBCMPIArgs\fP *out, \fBCMPIStatus\fP *rc)"
.br
.ti -1c
.RI "\fBCMPIStatus\fP \fBsetProperty\fP (\fBCMCIClient\fP *mb, \fBCMPIObjectPath\fP *cop, const char *name, \fBCMPIValue\fP *value, \fBCMPIType\fP type)"
.br
.ti -1c
.RI "\fBCMPIData\fP \fBgetProperty\fP (\fBCMCIClient\fP *mb, \fBCMPIObjectPath\fP *cop, const char *name, \fBCMPIStatus\fP *rc)"
.br
.ti -1c
.RI "\fBCMPIConstClass\fP * \fBgetClass\fP (\fBCMCIClient\fP *mb, \fBCMPIObjectPath\fP *cop, \fBCMPIFlags\fP flags, char **properties, \fBCMPIStatus\fP *rc)"
.br
.ti -1c
.RI "\fBCMPIEnumeration\fP * \fBenumClassNames\fP (\fBCMCIClient\fP *mb, \fBCMPIObjectPath\fP *cop, \fBCMPIFlags\fP flags, \fBCMPIStatus\fP *rc)"
.br
.ti -1c
.RI "\fBCMPIEnumeration\fP * \fBenumClasses\fP (\fBCMCIClient\fP *mb, \fBCMPIObjectPath\fP *cop, \fBCMPIFlags\fP flags, \fBCMPIStatus\fP *rc)"
.br
.SH DESCRIPTION
Client library class that provides the methods for connecting to and 
accessing the CIMOM.
.SH "SEE ALSO"
Common Manageability Programming Interface (CMPI) - OpenGroup,
.br
CMCIClientFT.associatorNames(3), CMCIClientFT.associators(3),
.br
CMCIClientFT.createInstance(3), CMCIClientFT.deleteInstance(3),
.br
CMCIClientFT.enumClasses(3), CMCIClientFT.enumClassNames(3),
.br
CMCIClientFT.enumInstanceNames(3), CMCIClientFT.enumInstances(3),
.br
CMCIClientFT.execQuery(3), CMCIClientFT.getClass(3),
.br
CMCIClientFT.getInstance(3), CMCIClientFT.getProperty(3),
.br
CMCIClientFT.invokeMethod(3), CMCIClientFT.referenceNames(3),
.br
CMCIClientFT.references(3), CMCIClientFT.setInstance(3),
.br
CMCIClientFT.setProperty(3), cmciConnect(3)


--- NEW FILE: CMPIStatus.3 ---
.TH  3  2005-06-09 "sfcc" "SFCBroker Client Library"
.SH NAME
CMPIStatus \- CMPIStatus class implementation
.SH SYNOPSIS
.br
.SS "Public Attributes"
.in +1c
.ti -1c
.RI "\fBCMPIrc\fP \fBrc;\fP"
.br
.RI "\fIstatus code for operation. \fP"
.br
.ti -1c
.RI "\fBCMPIString\fP * \fBmsg;\fP"
.br
.RI "\fIString description for status code, when errors occur. \fP"
.in +1c
.SH METHODS
.br
.SH DESCRIPTION
Native CMPIStatus implementation. 

This is the native CMPIStatus implementation as used for remote providers. It reflects the well-defined interface of a regular CMPIStatus object, however, it works independently from the management broker.
.PP
It is part of a native broker implementation that simulates CMPI data types rather than interacting with the entities in a full-grown CIMOM.
.SH "SEE ALSO"
Common Manageability Programming Interface (CMPI) - OpenGroup

--- NEW FILE: CMCIClientFT.setInstance.3 ---
.TH  3  2005-06-09 "sfcc" "SFCBroker Client Library"
.SH NAME
CMCIClientFT.setInstance() \- Replace class instance
.SH SYNOPSIS
.nf
.B #include <cmci.h>
.sp
.BI CMPIStatus *
.BI CMCIClientFT.setInstance (CMCIClient* cl,
.br
.BI				CMPIObjectPath* op,
.br
.BI				CMPIFlags flags,
.br
.BI				char** properties,
.br
.BI				CMPIStatus* rc);
.br
.sp
.fi
.SH DESCRIPTION
Replace a class instance with \fIinst\fP using \fIop\fP as reference. 
The content of the returned class instance structure can be controled
using the \fIflags\fP parameter.
.PP
Arguments are the client object pointer \fIcl\fP, an ObjectPath object 
pointer \fIop\fP that contains namespace and classname components,
\fIflags\fP to affect the returned class instance structure content,
 \fIproperties\fP array, and \fIrc\fP which returns the operation status 
(suppressed when NULL).
.PP
The \fIflags\fP argument is a bit mask that can contain 
the following flag - \fICMPI_FLAG_IncludeQualifiers\fP.
.PP
The \fIproperties\fP array defines what properties should be returned 
for the class.
If this argument is not NULL, only the class properties in the list are 
returned.
If it's NULL all class properties are returned.
.PP
.SH "RETURN VALUE"
When successful the \fBCMCIClientFT.setInstance()\fP function returns a
CMPIStatus object with a successful operation status code.
When unsuccessful it returns the operation error code and 
corresponding error string.
.SH "ERRORS"
.sp
.SH "EXAMPLES"
.sp
.SH "CONFORMING TO"
.sp
.SH "SEE ALSO"
Common Manageability Programming Interface (CMPI) - OpenGroup,
.br
CMCIClient(3), CMPIStatus(3), CMPIObjectPath(3), CMPIFlags(3)

--- NEW FILE: CMPIObjectPath.3 ---
.TH  3  2005-06-09 "sfcc" "SFCBroker Client Library"
.SH NAME
CMPIObjectPath \- CMPIObjectPath class implementation
.SH SYNOPSIS
.br
.SS "Public Attributes"
.in +1c
.ti -1c
.RI "int \fBvoid * hdl\fP
.br
Opaque pointer to class instance data.
.ti -1c
.RI "\fBCMPIObjectPathFT\fP * \fBft\fP"
.br
.RI "\fIPointer to the Args Function Table. \fP"
.in -1c
.SH METHODS
.ti -1c
.RI "\fBCMPIStatus\fP(* \fBrelease\fP )(\fBCMPIObjectPath\fP *op)"
.br
.RI "\fIThe ObjectPath object will not be used any further and may be freed by CMPI run time system. \fP"
.ti -1c
.RI "\fBCMPIObjectPath\fP *(* \fBclone\fP )(\fBCMPIObjectPath\fP *op, \fBCMPIStatus\fP *rc)"
.br
.RI "\fICreate an independent copy of this ObjectPath object. \fP"
.ti -1c
.RI "\fBCMPIStatus\fP(* \fBsetNameSpace\fP )(\fBCMPIObjectPath\fP *op, const char *ns)"
.br
.RI "\fISet/replace the namespace component. \fP"
.ti -1c
.RI "\fBCMPIString\fP *(* \fBgetNameSpace\fP )(\fBCMPIObjectPath\fP *op, \fBCMPIStatus\fP *rc)"
.br
.RI "\fIGet the namespace component. \fP"
.ti -1c
.RI "\fBCMPIStatus\fP(* \fBsetHostname\fP )(\fBCMPIObjectPath\fP *op, const char *hn)"
.br
.RI "\fISet/replace the hostname component. \fP"
.ti -1c
.RI "\fBCMPIString\fP *(* \fBgetHostname\fP )(\fBCMPIObjectPath\fP *op, \fBCMPIStatus\fP *rc)"
.br
.RI "\fIGet the hostname component. \fP"
.ti -1c
.RI "\fBCMPIStatus\fP(* \fBsetClassName\fP )(\fBCMPIObjectPath\fP *op, const char *cn)"
.br
.RI "\fISet/replace the classname component. \fP"
.ti -1c
.RI "\fBCMPIString\fP *(* \fBgetClassName\fP )(\fBCMPIObjectPath\fP *op, \fBCMPIStatus\fP *rc)"
.br
.RI "\fIGet the classname component. \fP"
.ti -1c
.RI "\fBCMPIStatus\fP(* \fBaddKey\fP )(\fBCMPIObjectPath\fP *op, const char *name, \fBCMPIValue\fP *value, \fBCMPIType\fP type)"
.br
.RI "\fIAdds/replaces a named key property. \fP"
.ti -1c
.RI "\fBCMPIData\fP(* \fBgetKey\fP )(\fBCMPIObjectPath\fP *op, const char *name, \fBCMPIStatus\fP *rc)"
.br
.RI "\fIGets a named key property value. \fP"
.ti -1c
.RI "\fBCMPIData\fP(* \fBgetKeyAt\fP )(\fBCMPIObjectPath\fP *op, unsigned int index, \fBCMPIString\fP **name, \fBCMPIStatus\fP *rc)"
.br
.RI "\fIGets a key property value defined by its index. \fP"
.ti -1c
.RI "unsigned int(* \fBgetKeyCount\fP )(\fBCMPIObjectPath\fP *op, \fBCMPIStatus\fP *rc)"
.br
.RI "\fIGets the number of key properties contained in this ObjectPath. \fP"
.ti -1c
.RI "\fBCMPIStatus\fP(* \fBsetNameSpaceFromObjectPath\fP )(\fBCMPIObjectPath\fP *op, \fBCMPIObjectPath\fP *src)"
.br
.RI "\fISet/replace namespace and classname components from <src>. \fP"
.ti -1c
.RI "\fBCMPIStatus\fP(* \fBsetHostAndNameSpaceFromObjectPath\fP )(\fBCMPIObjectPath\fP *op, \fBCMPIObjectPath\fP *src)"
.br
.RI "\fISet/replace hostname, namespace and classname components from <src>. \fP"
.ti -1c
.RI "\fBCMPIData\fP(* \fBgetClassQualifier\fP )(\fBCMPIObjectPath\fP *op, const char *qName, \fBCMPIStatus\fP *rc)"
.br
.RI "\fIGet class qualifier value. \fP"
.ti -1c
.RI "\fBCMPIData\fP(* \fBgetPropertyQualifier\fP )(\fBCMPIObjectPath\fP *op, const char *pName, const char *qName, \fBCMPIStatus\fP *rc)"
.br
.RI "\fIGet property qualifier value. \fP"
.ti -1c
.RI "\fBCMPIData\fP(* \fBgetMethodQualifier\fP )(\fBCMPIObjectPath\fP *op, const char *methodName, const char *qName, \fBCMPIStatus\fP *rc)"
.br
.RI "\fIGet method qualifier value. \fP"
.ti -1c
.RI "\fBCMPIData\fP(* \fBgetParameterQualifier\fP )(\fBCMPIObjectPath\fP *op, const char *mName, const char *pName, const char *qName, \fBCMPIStatus\fP *rc)"
.br
.RI "\fIGet method parameter quailifier value. \fP"
.ti -1c
.RI "\fBCMPIString\fP *(* \fBtoString\fP )(\fBCMPIObjectPath\fP *op, \fBCMPIStatus\fP *rc)"
.br
.RI "\fIGenerates a well formed string representation of this ObjectPath. \fP"
.in -1c
.SH DESCRIPTION
.PP 
Native CMPIObjectPath implementation. 

This is the native CMPIObjectPath implementation as used for remote providers. It reflects the well-defined interface of a regular CMPIObjectPath, however, it works independently from the management broker.
.PP
It is part of a native broker implementation that simulates CMPI data types rather than interacting with the entities in a full-grown CIMOM.
.SH Examples
.RI "\fBCMPIString * namespace = objpath->ft->getNameSpace(objectpath, NULL);\fP"
.br
.RI "\fBCMPIString * classname = objpath->ft->getClassName(objectpath, NULL);\fP"
.br
.RI "\fBint numkeys = objectpath->ft->getKeyCount(objectpath, NULL);\fP"

.SH "SEE ALSO"
Common Manageability Programming Interface (CMPI) - OpenGroup

--- NEW FILE: CMCIClientFT.setProperty.3 ---
.TH  3  2005-06-09 "sfcc" "SFCBroker Client Library"
.SH NAME
CMCIClientFT.setProperty() \- Set a named property value of an instance
.SH SYNOPSIS
.nf
.B #include <cmci.h>
.sp
.BI CMPIStatus
.BI CMCIClientFT.setProperty (CMCIClient* cl,
.br
.BI				CMPIObjectPath* op,
.br
.BI				const char* name,
.br
.BI				CMPIValue* value,
.br
.BI				CMPIType type);
.br
.sp
.fi
.SH DESCRIPTION
Set the named property value of an instance identified by reference \fIop\fP.
.PP
Arguments are the client object pointer \fIcl\fP, an ObjectPath object 
pointer \fIop\fP with the namespace and classname to identify the instance,
a pointer to a string with the property name to set in \fIname\fP,
a pointer to the CMPIValue with the value to set in \fIvalue\fP,
and \fIrc\fP which returns the operation status (suppressed when NULL).
.PP
.SH "RETURN VALUE"
When successful the \fBCMCIClientFT.setProperty()\fP function returns
a CMPIStatus object with a successful operation status code set.
When unsuccessful it returns the CMPIStatus object with the error code 
and corresponding error string set.
.SH "ERRORS"
.sp
.SH "EXAMPLES"
.sp
.SH "CONFORMING TO"
.sp
.SH "SEE ALSO"
Common Manageability Programming Interface (CMPI) - OpenGroup,
.br
CMCIClient(3), CMPIStatus(3), CMPIObjectPath(3), CMPIValue(3),
CMPIType(3)

--- NEW FILE: CMPIArgs.3 ---
.TH  3  2005-06-09 "sfcc" "SFCBroker Client Library"
.SH NAME
CMPIArgs \- CMPIArgs class implementation
.SH SYNOPSIS
.br
.SS "Public Attributes"
.in +1c
.ti -1c
.RI "int \fBvoid * hdl\fP
.br
Opaque pointer to class instance data.
.ti -1c
.RI "\fBCMPIArgsFT\fP * \fBft\fP"
.br
.RI "\fIPointer to the Args Function Table. \fP"
.in -1c
.SH METHODS
.in +1c
.ti -1c
.RI "\fBCMPIStatus\fP \fBrelease\fP (\fBCMPIArgs\fP *args)"
.br
.ti -1c
.RI "\fBCMPIArgs\fP * \fBclone\fP (\fBCMPIArgs\fP *args, \fBCMPIStatus\fP *rc)"
.br
.ti -1c
.RI "\fBCMPIStatus\fP \fBaddArg\fP (\fBCMPIArgs\fP *args, char *name, \fBCMPIValue\fP *value, \fBCMPIType\fP type)"
.br
.ti -1c
.RI "\fBCMPIData\fP \fBgetArg\fP (\fBCMPIArgs\fP *args, char *name, \fBCMPIStatus\fP *rc)"
.br
.ti -1c
.RI "\fBCMPIData\fP \fBgetArgAt\fP (\fBCMPIArgs\fP *args, unsigned int index, \fBCMPIString\fP **name, \fBCMPIStatus\fP *rc)"
.br
.ti -1c
.RI "unsigned int \fBgetArgCount\fP (\fBCMPIArgs\fP *args, \fBCMPIStatus\fP *rc)"
.br
.in -1c
.SH DESCRIPTION
Native CMPIArgs implementation. 

This is the native CMPIArgs implementation as used for remote providers. It reflects the well-defined interface of a regular CMPIArgs object, however, it works independently from the management broker.
.PP
It is part of a native broker implementation that simulates CMPI data types rather than interacting with the entities in a full-grown CIMOM.
.SH "SEE ALSO"
Common Manageability Programming Interface (CMPI) - OpenGroup

--- NEW FILE: CMCIClientFT.associators.3 ---
.TH  3  2005-06-09 "sfcc" "SFCBroker Client Library"
.SH NAME
CMCIClientFT.associators() \- Enumerate instances associated with an Instance
.SH SYNOPSIS
.nf
.B #include <cmci.h>
.sp
.BI CMPIEnumeration *
.BI CMCIClientFT.associators (CMCIClient* cl,
.br
.BI				CMPIObjectPath* op,
.br
.BI				const char *assocClass,
.br
.BI				const char *resultClass,
.br
.BI				const char *role,
.br
.BI				const char *resultRole,
.br
.BI				CMPIFlags flags,
.br
.BI				char** properties,
.br
.BI				CMPIStatus* rc);
.br
.sp
.fi
.SH DESCRIPTION
Enumerate instances associated with the Instance defined by \fIop\fP reference.
.PP
Arguments are the client object pointer \fIcl\fP, an ObjectPath object 
pointer \fIop\fP with the reference that contains namespace and classname
components,
\fIassocClass\fP, where if it's not NULL is an association class name that 
is used to filter the returned set of instance objects by eliminating 
objects that aren't associated to the source object by an instance of 
this class or one of its subclasses,
\fIresultClass\fP, where if it's not NULL is a valid class name that 
is used to filter the returned set of Objects by eliminating objects that
aren't an Instance of this Class or one of its subclasses,
\fIrole\fP, where if it's not NULL is a valid property name that 
is used to filter the returned set of instance objects by eliminating
objects that aren't associated to the source object by an association 
where the source object plays the specified role, i.e. the name of the 
property in the association class that refers to the source object 
has to match the value of this parameter,
\fIresultRole\fP, where if it's not NULL is a valid property name that 
is used to filter the returned set of instance objects by eliminating 
objects that aren't associated to the source object by an association
where the returned object plays the specified role, i.e. the name of 
the property in the association class that refers to the returned object
has to match the value of this parameter,
\fIflags\fP that affect the content of the returned class instance structures,
a \fIproperties\fP array, and \fIrc\fP which returns the operation status 
(suppressed when NULL).
.PP
The \fIflags\fP argument is a bit mask that can contains the following flags - 
\fICMPI_FLAG_IncludeQualifiers\fP and \fICMPI_FLAG_IncludeClassOrigin\fP.
.SH "RETURN VALUE"
When successful the \fBCMCIClientFT.associators()\fP function returns
a pointer to a CMPIEnumeration object that contains the class instances 
found for the class that match the association criteria and sets a 
successful operation status code in \fIrc\fR.
When unsuccessful it returns a NULL pointer and sets the operation 
status error code and corresponding error string in \fIrc\fP.
.SH "ERRORS"
.sp
.SH "EXAMPLES"
.sp
.SH "CONFORMING TO"
.sp
.SH "SEE ALSO"
Common Manageability Programming Interface (CMPI) - OpenGroup,
.br
CMCIClient(3), CMPIEnumeration(3), CMPIObjectPath(3), CMPIFlags(3),
CMPIStatus(3)

--- NEW FILE: CMCIClientFT.execQuery.3 ---
.TH  3  2005-06-09 "sfcc" "SFCBroker Client Library"
.SH NAME
CMCIClientFT.execQuery() \- Query the enumeration of instances of a class
.SH SYNOPSIS
.nf
.B #include <cmci.h>
.sp
.BI CMPIEnumeration *
.BI CMCIClientFT.execQuery (CMCIClient* cl,
.br
.BI				CMPIObjectPath* op,
.br
.BI				const char* query,
.br
.BI				const char* lang,
.br
.BI				CMPIStatus* rc);
.br
.sp
.fi
.SH DESCRIPTION
Query the enumeration of instances of the class (and subclasses) defined
by reference \fIop\fP using the \fIquery\fP expression.
.PP
Arguments are the client object pointer \fIcl\fP, an ObjectPath object 
pointer \fIop\fP with the reference that contains namespace and classname
components,
the query expression string pointer in \fIquery\fP,
the query language identifier string pointer in \fIlang\fP,
and \fIrc\fP which returns the operation status (suppressed when NULL).
.PP
.SH "RETURN VALUE"
When successful the \fBCMCIClientFT.execQuery()\fP function returns a
pointer to a CMPIEnumeration object that contains the class instances 
that match the query and sets a successful operation status code.
When unsuccessful it returns a NULL pointer and sets the operation 
status error code and corresponding error string in \fIrc\fP.
.SH "ERRORS"
.sp
.SH "EXAMPLES"
.sp
.SH "CONFORMING TO"
.sp
.SH "SEE ALSO"
Common Manageability Programming Interface (CMPI) - OpenGroup,
.br
CMCIClient(3), CMPIEnumeration(3), CMPIObjectPath(3), CMPIStatus(3)

--- NEW FILE: CMPIString.3 ---
.TH  3  2005-06-09 "sfcc" "SFCBroker Client Library"
.SH NAME
CMPIString \- CMPIString class implementation
.SH SYNOPSIS
.br
.SS "Public Attributes"
.in +1c
.ti -1c
.RI "int \fBvoid * hdl;\fP
.br
.RI "\fIOpaque pointer to class instance data. \fP"
.ti -1c
.RI "\fBCMPIStringFT\fP * \fBft;\fP"
.br
.RI "\fIPointer to the Args Function Table. \fP"
.in -1c
.SH METHODS
.in +1c
.ti -1c
.RI "\fBCMPIStatus\fP \fBrelease\fP (\fBCMPIString\fP *string)"
.br
.ti -1c
.RI "\fBCMPIString\fP * \fBclone\fP (\fBCMPIString\fP *string, \fBCMPIStatus\fP *rc)"
.br
.ti -1c
.RI "char * \fBgetCharPtr\fP (\fBCMPIString\fP *string, \fBCMPIStatus\fP *rc)"
.br
.in -1c
.SH DESCRIPTION
.PP 
CMPIString class implementation, representing the Encapsulated String object. 

This is the native CMPIString implementation as used for remote providers. It reflects the well-defined interface of a regular CMPIString, however, it works independently from the management broker.
.PP
It is part of a native broker implementation that simulates CMPI data types rather than interacting with the entities in a full-grown CIMOM.
.SH "SEE ALSO"
Common Manageability Programming Interface (CMPI) - OpenGroup

--- NEW FILE: cmciConnect.3 ---
.TH  3  2005-06-09 "sfcc" "SFCBroker Client Library"
.SH NAME
cmciConnect() \- Create a CMCIClient object and connection
.SH SYNOPSIS
.nf
.B #include <cmci.h>
.sp
.BI CMCIClient *
.BI cmciClient (const char* hostName, const char* hostPort, 
.br
.BI		const char* CimUsername, const char* CimPassword,
.br
.BI				CMPIStatus* rc);
.br
.sp
.fi
.SH DESCRIPTION
Create a CMCIClient object and initialize it with the CIMOM connection 
hostname and port, the security credentials to log into the CIMOM, and
the internals for sending requests and receiving responses from the CIMOM.
.PP
Arguments are the \fIhostName\fP and \fIhostPort\fP to connect, the 
\fICimUsername\fP and \fICimPassword credentials for authentication 
with the CIMOM, and a pointer to an object to receive the CMPIStatus
operation status.
.SH "RETURN VALUE"
When successful the \fIcmciConnect\fP function returns a pointer to a 
dynamically allocated and initialized CMCIClient object with a successful
operation status code set.
When unsuccessful it returns NULL and sets \fIrc\fP object with the error
code and corresponding error string.
.SH "ERRORS"
.sp
.SH "EXAMPLES"
.nf
   CMCIClient *cc;

   /* Setup a local conncetion to the CIMOM */   
   cc = cmciConnect("localhost",NULL,NULL,NULL,NULL);
.fi
.sp
.SH "CONFORMING TO"
.sp
.SH "SEE ALSO"
Common Manageability Programming Interface (CMPI) - OpenGroup,
.br
CMCIClient(3), CMPIStatus(3)

--- NEW FILE: CMCIClientFT.enumClasses.3 ---
.TH  3  2005-06-09 "sfcc" "SFCBroker Client Library"
.SH NAME
CMCICLientFT.enumClasses() \- Enumerate classes and subclasss
.SH SYNOPSIS
.nf
.B #include <cmci.h>
.sp
.BI CMPIEnumeration *
.BI CMCIClientFT.enumClasses (CMCIClient* cl,
.br
				    CMPIObjectPath* op,
.br
				    CMPIFlags flags,
.br
				    CMPIStatus* rc);
.br
.sp
.fi
.SH DESCRIPTION
Enumerate Classies using \fIop\fP as reference. The content of the returned
classes can be controled using the \fIflags\fP parameter.
.PP
Arguments are the client object pointer \fIcl\fP, ObjectPath object 
pointer \fIop\fP that contains namespace and classname components,
\fIflags\fP to affect the returned class structure content, 
and \fIrc\fP the CMPI return status (suppressed when NULL).
.PP
The \fIflags\fP argument is a bit mask that can contain the flags 
\fICMPI_FLAG_LocalOnly\fP, \fICMPI_FLAG_DeepInheritance\fP, 
\fICMPI_FLAG_IncludeQualifiers\fP, and \fICMPI_FLAG_IncludeClassOrigin\fP.
.PP
.SH "RETURN VALUE"
When successful the \fBCMCIClientFT.enumClasses()\fP function returns
a pointer to a CMPIEnumeration object that contains each enumerated class
and sets a successful status code
in \fIrc\fR.
When unsuccessful it returns NULL and sets the \fIrc\fP argument with the
error code and and corresponding error string.
.SH "ERRORS"
.sp
.SH "EXAMPLES"
   CMCIClient *cc;
   CMPIObjectPath * objectpath;
   CMPIInstance * instance;
   CMPIEnumeration * enumeration;
   CMPIStatus status;

   /* Setup a conncetion to the CIMOM */   
   cc = cmciConnect("localhost",NULL,NULL,NULL,NULL);

   objectpath = newCMPIObjectPath("root/cimv2", NULL, NULL);
   enumeration = cc->ft->enumClasses(cc, objectpath, 0, &status);

   if (!status.rc) {
	fprintf(stderr, "operation error code %d description %s\n",
			status.rc, status.msg->hdl);
	abort();
   }
.fi
.SH "CONFORMING TO"
.sp
.SH "SEE ALSO"
Common Manageability Programming Interface (CMPI) - OpenGroup,
.br
CMCIClient(3), CMPIEnumeration(3), CMPIObjectPath(3), CMPIFlags(3), 
CMPIStatus(3)

--- NEW FILE: CMCIClientFT.associatorNames.3 ---
.TH  3  2005-06-09 "sfcc" "SFCBroker Client Library"
.SH NAME
CMCICLientFT.associatorNames() \- Enumerate ObjectPaths associated with an Instance
.SH SYNOPSIS
.nf
.B #include <cmci.h>
.sp
.BI CMPIEnumeration *
.BI CMCIClientFT.associatorNames (CMCIClient* cl,
.br
.BI				CMPIObjectPath* op,
.br
.BI				const char *assocClass,
.br
.BI				const char *resultClass,
.br
.BI				const char *role,
.br
.BI				const char *resultRole,
.br
.BI				CMPIStatus* rc);
.br
.sp
.fi
.SH DESCRIPTION
Enumerate ObjectPath references associated with the Instance defined 
by \fIop\fP reference.
.PP
Arguments are the client object pointer \fIcl\fP,
an ObjectPath object pointer \fIop\fP with the reference that contains
namespace and classname components,
\fIassocClass\fP, where if it's not NULL is an association class name that 
is used to filter the returned set of ObjectPath objects by eliminating 
objects that aren't associated to the source object by an instance of 
this class or one of its subclasses,
\fIresultClass\fP, where if it's not NULL is a valid class name that 
is used to filter the returned set of Objects by eliminating objects that
aren't an Instance of this Class or one of its subclasses,
\fIrole\fP, where if it's not NULL is a valid property name that 
is used to filter the returned set of ObjectPath objects by eliminating
objects that aren't associated to the source object by an association 
where the source object plays the specified role, i.e. the name of the 
property in the association class that refers to the source object 
has to match the value of this parameter,
\fIresultRole\fP, where if it's not NULL is a valid property name that 
is used to filter the returned set of ObjectPath objects by eliminating 
objects that aren't associated to the source object by an association
where the returned object plays the specified role, i.e. the name of 
the property in the association class that refers to the returned object
has to match the value of this parameter,
\fIrc\fP which returns the operation status (suppressed when NULL).
.PP
The \fIflags\fP argument is a bit mask that can contains the following flags - 
\fICMPI_FLAG_IncludeQualifiers\fP and \fICMPI_FLAG_IncludeClassOrigin\fP.
.SH "RETURN VALUE"
When successful the \fBCMCIClientFT.associatorNames()\fP function returns
a pointer to a CMPIEnumeration object that contains the ObjectPath objects
found for the class that match the association criteria and sets a 
successful operation status code in \fIrc\fR.
When unsuccessful it returns a NULL pointer and sets the operation 
status error code and corresponding error string in \fIrc\fP.
.SH "ERRORS"
.sp
.SH "EXAMPLES"
.sp
.SH "CONFORMING TO"
.sp
.SH "SEE ALSO"
Common Manageability Programming Interface (CMPI) - OpenGroup,
.br
CMCIClient(3), CMPIEnumeration(3), CMPIObjectPath(3), CMPIStatus(3)

--- NEW FILE: CMCIClientFT.references.3 ---
.TH  3  2005-06-09 "sfcc" "SFCBroker Client Library"
.SH NAME
CMCIClientFT.references() \- Enumerate association instances for a class instance
.SH SYNOPSIS
.nf
.B #include <cmci.h>
.sp
.BI CMPIEnumeration *
.BI CMCIClientFT.references (CMCIClient* cl,
.br
.BI				CMPIObjectPath* op,
.br
.BI				const char *resultClass,
.br
.BI				const char *role,
.br
.BI				CMPIFlags flags,
.br
.BI				char** properties,
.br
.BI				CMPIStatus* rc);
.br
.sp
.fi
.SH DESCRIPTION
Enumerate association instances that refer to the Instance defined
by the \fIop\fP reference.
.PP
Arguments are the client object pointer \fIcl\fP, an ObjectPath object 
pointer \fIop\fP with the reference that contains namespace and classname
components,
\fIresultClass\fP, where if it's not NULL is a valid class name that 
is used to filter the returned set of Objects by eliminating objects that
aren't an Instance of this Class or one of its subclasses,
\fIrole\fP, where if it's not NULL is a valid property name that 
is used to filter the returned set of instance objects by eliminating
objects that aren't associated to the source object by an association 
where the source object plays the specified role, i.e. the name of the 
property in the association class that refers to the source object 
has to match the value of this parameter,
\fIflags\fP that affect the content of the returned class instance structures,
a \fIproperties\fP array, and \fIrc\fP which returns the operation status 
(suppressed when NULL).
.PP
The \fIflags\fP argument is a bit mask that can contains the following flags - 
\fICMPI_FLAG_IncludeQualifiers\fP and \fICMPI_FLAG_IncludeClassOrigin\fP.
.SH "RETURN VALUE"
When successful the \fBCMCIClientFT.references()\fP function returns
a pointer to a CMPIEnumeration object that contains the class association
instance objects found that match the association criteria, and sets a 
successful operation status code in \fIrc\fR.
When unsuccessful it returns a NULL pointer and sets the operation 
status error code and corresponding error string in \fIrc\fP.
.SH "ERRORS"
.sp
.SH "EXAMPLES"
.sp
.SH "CONFORMING TO"
.sp
.SH "SEE ALSO"
Common Manageability Programming Interface (CMPI) - OpenGroup,
.br
CMCIClient(3), CMPIEnumeration(3), CMPIObjectPath(3), CMPIFlags(3),
CMPIStatus(3)

--- NEW FILE: CMCIClientFT.enumInstanceNames.3 ---
.TH  3  2005-06-09 "sfcc" "SFCBroker Client Library"
.SH NAME
CMCIClientFT.enumInstanceNames() \- Enumerate instance names of a class
.SH SYNOPSIS
.nf
.B #include <cmci.h>
.sp
.BI CMPIEnumeration *
.BI CMCIClientFT.enumInstanceNames (CMCIClient* cl,
.br
.BI				CMPIObjectPath* op,
.br
.BI				CMPIStatus* rc);
.br
.sp
.fi
.SH DESCRIPTION
Enumerate Instance Names of the class (and subclasses) defined by \fIop\fP.
.PP
Arguments are the client object pointer \fIcl\fP, an ObjectPath object 
pointer \fIop\fP with the reference that contains namespace and classname
components, and \fIrc\fP which returns the operation status (suppressed 
when NULL).
.PP
.SH "RETURN VALUE"
When successful the \fBCMCIClientFT.enumInstanceNames()\fP function returns
a pointer to a CMPIEnumeration object that contains strings for each instance
name found for the class and sets a successful operation status code 
in \fIrc\fR.
When unsuccessful it returns a NULL pointer and sets the operation 
status error code and corresponding error string in \fIrc\fP.
.SH "ERRORS"
.sp
.SH "EXAMPLES"
   CMCIClient *cc;
   CMPIObjectPath * objectpath;
   CMPIInstance * instance;
   CMPIEnumeration * enumeration;
   CMPIStatus status;

   /* Setup a conncetion to the CIMOM */   
   cc = cmciConnect("localhost",NULL,NULL,NULL,NULL);

   objectpath = newCMPIObjectPath("root/cimv2", NULL, NULL);
   enumeration = cc->ft->enumInstanceNames(cc, objectpath, &status);

   if (!status.rc) {
	fprintf(stderr, "operation error code %d description %s\n",
			status.rc, status.msg->hdl);
	abort();
   }
.SH "CONFORMING TO"
.sp
.SH "SEE ALSO"
Common Manageability Programming Interface (CMPI) - OpenGroup,
.br
CMCIClient(3), CMPIEnumeration(3), CMPIObjectPath(3), CMPIStatus(3)

--- NEW FILE: CMCIClientFT.getProperty.3 ---
.TH  3  2005-06-09 "sfcc" "SFCBroker Client Library"
.SH NAME
CMCIClientFT.getProperty() \- Get a named property value of an instance
.SH SYNOPSIS
.nf
.B #include <cmci.h>
.sp
.BI CMPIData
.BI CMCIClientFT.getProperty (CMCIClient* cl,
.br
.BI				CMPIObjectPath* op,
.br
.BI				const char* name,
.br
.BI				CMPIStatus* rc);
.br
.sp
.fi
.SH DESCRIPTION
Get the named property value of an instance identified by reference \fIop\fP.
.PP
Arguments are the client object pointer \fIcl\fP, an ObjectPath object 
pointer \fIop\fP with the namespace and classname to identify the instance,
a pointer to a string with the property name to get in \fIname\fP,
and \fIrc\fP which returns the operation status (suppressed when NULL).
.PP
.SH "RETURN VALUE"
When successful the \fBCMCIClientFT.getProperty()\fP function returns
a CMPIData object with the instance property value and sets a successful
operation status code in \fIrc\fR.
When unsuccessful it returns the CMPIStatus object with sets an operation
status error code and corresponding error string.
.SH "ERRORS"
.sp
.SH "EXAMPLES"
.sp
.SH "CONFORMING TO"
.sp
.SH "SEE ALSO"
Common Manageability Programming Interface (CMPI) - OpenGroup,
.br
CMCIClient(3), CMPIData(3), CMPIObjectPath(3), CMPIStatus(3)

--- NEW FILE: CMPIEnumeration.3 ---
.TH  3  2005-06-09 "sfcc" "SFCBroker Client Library"
.SH NAME
CMPIEnumeration \- CMPIEnumeration class implementation
.SH SYNOPSIS
.br
.SS "Public Attributes"
.in +1c
.ti -1c
.RI "int \fBvoid * hdl\fP
.br
Opaque pointer to class instance data.
.ti -1c
.RI "\fBCMPIEnumerationFT\fP * \fBft\fP"
.br
.RI "\fIPointer to the Args Function Table. \fP"
.in -1c
.SH METHODS
.ti -1c
.RI "\fBCMPIStatus\fP(* \fBrelease\fP )(\fBCMPIEnumeration\fP *en)"
.br
.RI "\fIThe Enumeration object will not be used any further and may be freed by CMPI run time system. \fP"
.ti -1c
.RI "\fBCMPIEnumeration\fP *(* \fBclone\fP )(\fBCMPIEnumeration\fP *en, \fBCMPIStatus\fP *rc)"
.br
.RI "\fICreate an independent copy of this Enumeration object. \fP"
.ti -1c
.RI "\fBCMPIData\fP(* \fBgetNext\fP )(\fBCMPIEnumeration\fP *en, \fBCMPIStatus\fP *rc)"
.br
.RI "\fIGet the next element of this Enumeration. \fP"
.ti -1c
.RI "\fBCMPIBoolean\fP(* \fBhasNext\fP )(\fBCMPIEnumeration\fP *en, \fBCMPIStatus\fP *rc)"
.br
.RI "\fITest for any elements left in this Enumeration. \fP"
.ti -1c
.RI "\fBCMPIArray\fP *(* \fBtoArray\fP )(\fBCMPIEnumeration\fP *en, \fBCMPIStatus\fP *rc)"
.br
.RI "\fIConvert this Enumeration into an Array. \fP"
.in -1c
.SH DESCRIPTION
.PP 
Native CMPIEnumeration implementation. 

This is the native CMPIEnumeration implementation as used for remote providers. It reflects the well-defined interface of a regular CMPIEnumeration, however, it works independently from the management broker.
.PP
It is part of a native broker implementation that simulates CMPI data types rather than interacting with the entities in a full-grown CIMOM.
.SH "SEE ALSO"
Common Manageability Programming Interface (CMPI) - OpenGroup

--- NEW FILE: CMCIClientFT.deleteInstance.3 ---
.TH  3  2005-06-09 "sfcc" "SFCBroker Client Library"
.SH NAME
CMCIClientFT.deleteInstance() \- Delete class instance
.SH SYNOPSIS
.nf
.B #include <cmci.h>
.sp
.BI CMPIStatus
.BI CMCIClientFT.deleteInstance (CMCIClient* cl,
.br
.BI				CMPIObjectPath* op);
.br
.sp
.fi
.SH DESCRIPTION
Delete a class instance using \fIop\fP as the instance reference. 
.PP
Arguments are the client object pointer \fIcl\fP and an ObjectPath object 
pointer \fIop\fP that contains namespace and classname components.
.PP
.SH "RETURN VALUE"
When successful the \fBCMCIClientFT.deleteInstance()\fP function returns a
CMPIStatus object with a successful operation status code.
When unsuccessful it returns the operation error code and 
corresponding error string in the CMPIStatus object.
.SH "ERRORS"
.sp
.SH "EXAMPLES"
.sp
.SH "CONFORMING TO"
.sp
.SH "SEE ALSO"
Common Manageability Programming Interface (CMPI) - OpenGroup,
.br
CMCIClient(3), CMPIStatus(3), CMPIObjectPath(3)

--- NEW FILE: CMCIClientFT.getClass.3 ---
.TH  3  2005-06-09 "sfcc" "SFCBroker Client Library"
.SH NAME
CMCIClientFT.getClass() \- Get class as reference
.SH SYNOPSIS
.nf
.B #include <cmci.h>
.sp
.BI CMPIConstClass *
.BI CMCIClientFT.getClass (CMCIClient* cl,
.br
.BI				CMPIObjectPath* op,
.br
.BI				CMPIFlags flags,
.br
.BI				char** properties,
.br
.BI				CMPIStatus* rc);
.br
.sp
.fi
.SH DESCRIPTION
Get Class using \fIop\fP as reference. The content of the returned
class structure can be controled using the \fIflags\fP parameter.
.PP
Arguments are the client object pointer \fIcl\fP, ObjectPath object 
pointer \fIop\fP that contains namespace and classname components,
\fIflags\fP to affect the returned class structure content, \fIproperties\fP
array, where if not NULL the members of the array define one or more Property
names, and \fIrc\fP the CMPI return status (suppressed when NULL).
.PP
The \fIflags\fP argument is a bit mask that can contain combinations of 
the following flags - CMPI_FLAG_LocalOnly, CMPI_FLAG_IncludeQualifiers and CMPI_FLAG_IncludeClassOrigin.
.PP
The \fIproperties\fP array defines what properties should be returned 
for the class.
If this argument is not NULL, only the class properties in the list are 
returned.
If it's NULL all class properties are returned.
.PP
.SH "RETURN VALUE"
When successful the \fBCMCIClientFT.getClass()\fP function returns a pointer
to a CMPIConstClass object and sets a successful status code in \fIrc\fR.
When unsuccessful it returns NULL and sets the \fIrc\fP argument with the
error code and and corresponding error string.
.SH "ERRORS"
.sp
.SH "EXAMPLES"
   CMCIClient *cc;
   CMPIObjectPath * objectpath;
   CMPIInstance * instance;
   CMPIEnumeration * enumeration;
   CMPIClass *class;
   CMPIStatus status;

   /* Setup a conncetion to the CIMOM */   
   cc = cmciConnect("localhost",NULL,NULL,NULL,NULL);

   objectpath = newCMPIObjectPath("root/cimv2", "Linux_ComputerSystem", NULL);
   class = cc->ft->getClass(cc, objectpath, 0, NULL, &status);

   if (!status.rc) {
	fprintf(stderr, "operation error code %d description %s\n",
			status.rc, status.msg->hdl);
	abort();
   }
.SH "CONFORMING TO"
.sp
.SH "SEE ALSO"
Common Manageability Programming Interface (CMPI) - OpenGroup,
.br
CMCIClient(3), CMPIConstClass(3), CMPIObjectPath(3), CMPIFlags(3), 
CMPIStatus(3)

--- NEW FILE: CMCIClientFT.createInstance.3 ---
.TH  3  2005-06-09 "sfcc" "SFCBroker Client Library"
.SH NAME
CMCIClientFT.createInstance() \- Create class instance
.SH SYNOPSIS
.nf
.B #include <cmci.h>
.sp
.BI CMPIObjectPath *
.BI CMCIClientFT.createInstance (CMCIClient* cl,
.br
.BI				CMPIObjectPath* op,
.br
.BI				CMPIInstance* inst,
.br
.BI				CMPIStatus* rc);
.br
.sp
.fi
.SH DESCRIPTION
Create class instance using \fIop\fP as reference.
.PP
Arguments are the client object pointer \fIcl\fP, ObjectPath object 
pointer \fIop\fP that contains namespace and classname components,
\fIinst\fP is a complete instance object pointer, and \fIrc\fP the
CMPI operation  status (suppressed when NULL).
.PP
.SH "RETURN VALUE"
When successful the \fBCMCIClientFT.createInstance()\fP function returns
a pointer to a CMPIObjectPath object with the new instance reference and 
sets a successful status code for \fIrc\fR.
When unsuccessful it returns NULL and sets the \fIrc\fP argument with the
error code and and corresponding error string.
.SH "ERRORS"
.sp
.SH "EXAMPLES"
.sp
.SH "SEE ALSO"
Common Manageability Programming Interface (CMPI) - OpenGroup,
.br
CMCIClient(3), CMPIObjectPath(3), CMPIInstance(3), CMPIStatus(3)

--- NEW FILE: CMPIInstance.3 ---
.TH  3  2005-06-09 "sfcc" "SFCBroker Client Library"
.SH NAME
CMPIInstance \- CMPIInstance class implementation
.SH SYNOPSIS
.br
.SS "Public Attributes"
.in +1c
.ti -1c
.RI "int \fBvoid * hdl\fP
.br
Opaque pointer to class instance data.
.ti -1c
.RI "\fBCMPIInstanceFT\fP * \fBft\fP"
.br
.RI "\fIPointer to the Args Function Table. \fP"
.in -1c
.SH METHODS
.ti -1c
.RI "\fBCMPIStatus\fP(* \fBrelease\fP )(\fBCMPIInstance\fP *inst)"
.br
.RI "\fIThe Instance object will not be used any further and may be freed by CMPI run time system. \fP"
.ti -1c
.RI "\fBCMPIInstance\fP *(* \fBclone\fP )(\fBCMPIInstance\fP *inst, \fBCMPIStatus\fP *rc)"
.br
.RI "\fICreate an independent copy of this Instance object. \fP"
.ti -1c
.RI "\fBCMPIData\fP(* \fBgetProperty\fP )(\fBCMPIInstance\fP *inst, const char *name, \fBCMPIStatus\fP *rc)"
.br
.RI "\fIGets a named property value. \fP"
.ti -1c
.RI "\fBCMPIData\fP(* \fBgetPropertyAt\fP )(\fBCMPIInstance\fP *inst, unsigned int index, \fBCMPIString\fP **name, \fBCMPIStatus\fP *rc)"
.br
.RI "\fIGets a Property value defined by its index. \fP"
.ti -1c
.RI "unsigned int(* \fBgetPropertyCount\fP )(\fBCMPIInstance\fP *inst, \fBCMPIStatus\fP *rc)"
.br
.RI "\fIGets the number of properties contained in this Instance. \fP"
.ti -1c
.RI "\fBCMPIStatus\fP(* \fBsetProperty\fP )(\fBCMPIInstance\fP *inst, const char *name, \fBCMPIValue\fP *value, \fBCMPIType\fP type)"
.br
.RI "\fIAdds/replaces a named Property. \fP"
.ti -1c
.RI "\fBCMPIObjectPath\fP *(* \fBgetObjectPath\fP )(\fBCMPIInstance\fP *inst, \fBCMPIStatus\fP *rc)"
.br
.RI "\fIGenerates an ObjectPath out of the namespace, classname and key propeties of this Instance. \fP"
.ti -1c
.RI "\fBCMPIStatus\fP(* \fBsetPropertyFilter\fP )(\fBCMPIInstance\fP *inst, char **propertyList, char **keys)"
.br
.RI "\fIDirects CMPI to ignore any setProperty operations for this instance for any properties not in this list. \fP"
.in -1c
.SH DESCRIPTION
.PP 
Native CMPIInstance implementation. 

This is the native CMPIInstance implementation as used for remote providers. It reflects the well-defined interface of a regular CMPIInstance, however, it works independently from the management broker.
.PP
It is part of a native broker implementation that simulates CMPI data types rather than interacting with the entities in a full-grown CIMOM.
.SH "SEE ALSO"
Common Manageability Programming Interface (CMPI) - OpenGroup

--- NEW FILE: CMCIClientFT.referenceNames.3 ---
.TH  3  2005-06-09 "sfcc" "SFCBroker Client Library"
.SH NAME
CMCIClientFT.referenceNames() \- Enumerate association ObjectPaths for a class instance
.SH SYNOPSIS
.nf
.B #include <cmci.h>
.sp
.BI CMPIEnumeration *
.BI CMCIClientFT.referenceNames (CMCIClient* cl,
.br
.BI				CMPIObjectPath* op,
.br
.BI				const char *resultClass,
.br
.BI				const char *role,
.br
.BI				CMPIStatus* rc);
.br
.sp
.fi
.SH DESCRIPTION
Enumerate association instances that refer to the Instance defined
by the \fIop\fP reference.
.PP
Arguments are the client object pointer \fIcl\fP, an ObjectPath object 
pointer \fIop\fP with the reference that contains namespace and classname
components,
\fIresultClass\fP, where if it's not NULL is a valid class name that 
is used to filter the returned set of association objects by eliminating
objects that aren't an Instance of this Class or one of its subclasses,
\fIrole\fP, where if it's not NULL is a valid property name that 
is used to filter the returned set of instance objects by eliminating
objects that aren't associated to the source object by an association 
where the source object plays the specified role, i.e. the name of the 
property in the association class that refers to the source object 
has to match the value of this parameter,
and \fIrc\fP which returns the operation status (suppressed when NULL).
.PP
.SH "RETURN VALUE"
When successful the \fBCMCIClientFT.referenceNames()\fP function returns
a pointer to a CMPIEnumeration object that contains the class association
reference objects found that match the association criteria, and sets a 
successful operation status code in \fIrc\fR.
When unsuccessful it returns a NULL pointer and sets the operation 
status error code and corresponding error string in \fIrc\fP.
.SH "ERRORS"
.sp
.SH "EXAMPLES"
.sp
.SH "CONFORMING TO"
.sp
.SH "SEE ALSO"
Common Manageability Programming Interface (CMPI) - OpenGroup,
.br
CMCIClient(3), CMPIEnumeration(3), CMPIObjectPath(3), CMPIStatus(3)

--- NEW FILE: CMCIClientFT.getInstance.3 ---
.TH  3  2005-06-09 "sfcc" "SFCBroker Client Library"
.SH NAME
CMCIClientFT.getInstance() \- Get class instance
.SH SYNOPSIS
.nf
.B #include <cmci.h>
.sp
.BI CMPIInstance *
.BI CMCIClientFT.getInstance (CMCIClient* cl,
.br
.BI				CMPIObjectPath* op,
.br
.BI				CMPIFlags flags,
.br
.BI				char** properties,
.br
.BI				CMPIStatus* rc);
.br
.sp
.fi
.SH DESCRIPTION
Get class instance using \fIop\fP as reference. The content of the returned
class instance structure can be controled using the \fIflags\fP parameter.
.PP
Arguments are the client object pointer \fIcl\fP, ObjectPath object 
pointer \fIop\fP that contains namespace and classname components,
\fIflags\fP to affect the returned class instance structure content,
 \fIproperties\fP array, and \fIrc\fP which returns the operation status 
(suppressed when NULL).
.PP
The \fIflags\fP argument is a bit mask that can contain combinations of 
the following flags - \fICMPI_FLAG_LocalOnly\fP, \fICMPI_FLAG_IncludeQualifiers\fP, and \fICMPI_FLAG_IncludeClassOrigin\fP.
.PP
The \fIproperties\fP array defines what properties should be returned 
for the class.
If this argument is not NULL, only the class properties in the list are 
returned.
If it's NULL all class properties are returned.
.PP
.SH "RETURN VALUE"
When successful the \fBCMCIClientFT.getInstance()\fP function returns a pointer
to a CMPIInstance object and sets a successful status code for \fIrc\fR.
When unsuccessful it returns NULL and sets the \fIrc\fP argument with the
error code and and corresponding error string.
.SH "ERRORS"
.sp
.SH "EXAMPLES"
.sp
.SH "CONFORMING TO"
.sp
.SH "SEE ALSO"
Common Manageability Programming Interface (CMPI) - OpenGroup,
.br
CMCIClient(3), CMPIInstance(3), CMPIObjectPath(3), CMPIFlags(3), 
CMPIStatus(3)

--- NEW FILE: CMCIClientFT.invokeMethod.3 ---
.TH  3  2005-06-09 "sfcc" "SFCBroker Client Library"
.SH NAME
CMCIClientFT.invokeMethod() \- Invoke a named method of an instance
.SH SYNOPSIS
.nf
.B #include <cmci.h>
.sp
.BI CMPIEnumeration *
.BI CMCIClientFT.invokeMethod (CMCIClient* cl,
.br
.BI				CMPIObjectPath* op,
.br
.BI				const char* method,
.br
.BI				CMPIArgs* in,
.br
.BI				CMPIArgs* out,
.br
.BI				CMPIStatus* rc);
.br
.sp
.fi
.SH DESCRIPTION
Invoke a named method of an instance defined by the \fIop\fP reference.
.PP
Arguments are the client object pointer \fIcl\fP, an ObjectPath object 
pointer \fIop\fP with the reference that contains namespace and classname
components,
\fImethod\fP pointer to string that identifies the class method,
\fIin\fP pointer to the input arguments,
\fIout\fP pointer to the output parameters,
and \fIrc\fP which returns the operation status (suppressed when NULL).
.SH "RETURN VALUE"
When successful the \fBCMCIClientFT.invokeMethod()\fP function returns
the CMPIData value returned by the method invoked and sets a successful
operation status code in \fIrc\fR.
When unsuccessful it returns a NULL pointer and sets the operation 
status error code and corresponding error string in \fIrc\fP.
.SH "ERRORS"
.sp
.SH "EXAMPLES"
.sp
.SH "CONFORMING TO"
.sp
.SH "SEE ALSO"
Common Manageability Programming Interface (CMPI) - OpenGroup,
.br
CMCIClient(3), CMPIEnumeration(3), CMPIObjectPath(3), CMPIArgs(3),
CMPIStatus(3)

--- NEW FILE: CMCIClientFT.enumClassNames.3 ---
.TH  3  2005-06-09 "sfcc" "SFCBroker Client Library"
.SH NAME
CMCICLientFT.enumClassNames() \- Enumerate class names
.SH SYNOPSIS
.nf
.B #include <cmci.h>
.sp
.BI CMPIEnumeration *
.BI CMCIClientFT.enumClassNames (CMCIClient* cl,
.br
.BI				CMPIObjectPath* op,
.br
.BI				CMPIFlags flags,
.br
.BI				CMPIStatus* rc);
.br
.sp
.fi
.SH DESCRIPTION
Get Class using \fIop\fP as reference. The content of the returned
class structure can be controled using the \fIflags\fP parameter.
.PP
Arguments are the client object pointer \fIcl\fP, ObjectPath object 
pointer \fIop\fP that contains namespace and classname components,
\fIflags\fP to affect the returned class structure content, 
and \fIrc\fP the CMPI return status (suppressed when NULL).
.PP
The \fIflags\fP argument is a bit mask that can contain the flag 
\fICMPI_FLAG_DeepInheritance\fP.
.PP
.SH "RETURN VALUE"
When successful the \fBCMCIClientFT.enumClassNames()\fP function returns
a pointer to a CMPIEnumeration object that contains each class name found
and sets a successful status code in \fIrc\fR.
When unsuccessful it returns NULL and sets the \fIrc\fP argument with the
error code and and corresponding error string.
.SH "ERRORS"
.sp
.SH "EXAMPLES"
.nf
   CMCIClient *cc;
   CMPIObjectPath * objectpath;
   CMPIEnumeration * enumeration;
   CMPIStatus status;

   /* Setup a conncetion to the CIMOM */   
   cc = cmciConnect("localhost",NULL,NULL,NULL,NULL);

   objectpath = newCMPIObjectPath("root/cimv2", NULL, NULL);
   enumeration = cc->ft->enumClassNames(cc, objectpath, 0, &status);

   if (!status.rc) {
	fprintf(stderr, "op error code %d description %s\n",
			 status.rc, status.msg->hdl);
	abort();
   }
.fi
.SH "CONFORMING TO"
.sp
.SH "SEE ALSO"
Common Manageability Programming Interface (CMPI) - OpenGroup,
.br
CMCIClient(3), CMPIEnumeration(3), CMPIObjectPath(3), CMPIFlags(3),
CMPIStatus(3)

--- NEW FILE: CMCIClientFT.enumInstances.3 ---
.TH  3  2005-06-09 "sfcc" "SFCBroker Client Library"
.SH NAME
CMCIClientFT.enumInstances() \- Enumerate instances of a class
.SH SYNOPSIS
.nf
.B #include <cmci.h>
.sp
.BI CMPIEnumeration *
.BI CMCIClientFT.enumInstances (CMCIClient* cl,
.br
.BI				CMPIObjectPath* op,
.br
.BI				CMPIFlags flags,
.br
.BI				char** properties,
.br
.BI				CMPIStatus* rc);
.br
.sp
.fi
.SH DESCRIPTION
Enumerate Instances of the class (and subclasses) defined by \fIop\fP.
The instance structure and inheritance scope can be controled using the
\fIflags\fP argument.
.PP
Arguments are the client object pointer \fIcl\fP, an ObjectPath object 
pointer \fIop\fP with the reference that contains namespace and classname
components,
\fIflags\fP that affect the content of the returned class instance structures,
a \fIproperties\fP array, and \fIrc\fP which returns the operation status 
(suppressed when NULL).
.PP
The \fIflags\fP argument is a bit mask that can contains the following 
flags - \fICMPI_FLAG_LocalOnly\fP, \fICMPI_FLAG_DeepInheritance\fP, 
\fICMPI_FLAG_IncludeQualifiers\fP and \fICMPI_FLAG_IncludeClassOrigin\fP.
.SH "RETURN VALUE"
When successful the \fBCMCIClientFT.enumInstances()\fP function returns
a pointer to a CMPIEnumeration object that contains the class instances 
found for the class and sets a successful operation status code in \fIrc\fR.
When unsuccessful it returns a NULL pointer and sets the operation 
status error code and corresponding error string in \fIrc\fP.
.SH "ERRORS"
.sp
.SH "EXAMPLES"
   CMCIClient *cc;
   CMPIObjectPath * objectpath;
   CMPIInstance * instance;
   CMPIEnumeration * enumeration;
   CMPIStatus status;

   /* Setup a conncetion to the CIMOM */   
   cc = cmciConnect("localhost",NULL,NULL,NULL,NULL);

   objectpath = newCMPIObjectPath("root/cimv2", NULL, NULL);
   enumeration = cc->ft->enumInstances(cc, objectpath, 0, NULL, &status);

   if (!status.rc) {
	fprintf(stderr, "operation error code %d description %s\n",
			status.rc, status.msg->hdl);
	abort();
   }
.SH "CONFORMING TO"
.sp
.SH "SEE ALSO"
Common Manageability Programming Interface (CMPI) - OpenGroup,
.br
CMCIClient(3), CMPIEnumeration(3), CMPIObjectPath(3), CMPIFlags(3),
CMPIStatus(3)

--- NEW FILE: CMPIValue.3 ---
.TH  3  2005-06-09 "sfcc" "SFCBroker Client Library"
.SH NAME
CMPIValue \- CMPIValue class implementation
.SH SYNOPSIS
.br
.SS "Public Attributes"

.in +1c
.ti -1c
.RI "\fBCMPIUint64\fP \fBuint64\fP"
.br
.ti -1c
.RI "\fBCMPIUint32\fP \fBuint32\fP"
.br
.ti -1c
.RI "\fBCMPIUint16\fP \fBuint16\fP"
.br
.ti -1c
.RI "\fBCMPIUint8\fP \fBuint8\fP"
.br
.ti -1c
.RI "\fBCMPISint64\fP \fBsint64\fP"
.br
.ti -1c
.RI "\fBCMPISint32\fP \fBsint32\fP"
.br
.ti -1c
.RI "\fBCMPISint16\fP \fBsint16\fP"
.br
.ti -1c
.RI "\fBCMPISint8\fP \fBsint8\fP"
.br
.ti -1c
.RI "\fBCMPIReal64\fP \fBreal64\fP"
.br
.ti -1c
.RI "\fBCMPIReal32\fP \fBreal32\fP"
.br
.ti -1c
.RI "\fBCMPIBoolean\fP \fBboolean\fP"
.br
.ti -1c
.RI "\fBCMPIChar16\fP \fBchar16\fP"
.br
.ti -1c
.RI "\fBCMPIInstance\fP * \fBinst\fP"
.br
.ti -1c
.RI "\fBCMPIObjectPath\fP * \fBref\fP"
.br
.ti -1c
.RI "\fBCMPIArgs\fP * \fBargs\fP"
.br
.ti -1c
.RI "\fBCMPIEnumeration\fP * \fBEnum\fP"
.br
.ti -1c
.RI "\fBCMPIArray\fP * \fBarray\fP"
.br
.ti -1c
.RI "\fBCMPIString\fP * \fBstring\fP"
.br
.ti -1c
.RI "char * \fBchars\fP"
.br
.ti -1c
.RI "\fBCMPIDateTime\fP * \fBdateTime\fP"
.br
.ti -1c
.RI "\fBCMPIValuePtr\fP \fBdataPtr\fP"
.br
.ti -1c
.RI "\fBCMPISint8\fP \fBByte\fP"
.br
.ti -1c
.RI "\fBCMPISint16\fP \fBShort\fP"
.br
.ti -1c
.RI "\fBCMPISint32\fP \fBInt\fP"
.br
.ti -1c
.RI "\fBCMPISint64\fP \fBLong\fP"
.br
.ti -1c
.RI "\fBCMPIReal32\fP \fBFloat\fP"
.br
.ti -1c
.RI "\fBCMPIReal64\fP \fBDouble\fP"
.br
.in -1c
.SH METHODS

.in +1c
.ti -1c
.RI "void \fBnative_release_CMPIValue\fP (\fBCMPIType\fP type, \fBCMPIValue\fP *val)"
.br
.ti -1c
.RI "\fBCMPIValue\fP \fBnative_clone_CMPIValue\fP (\fBCMPIType\fP type, \fBCMPIValue\fP *val, \fBCMPIStatus\fP *rc)"
.br
.ti -1c
.RI "char * \fBpathToChars\fP (\fBCMPIObjectPath\fP *cop, \fBCMPIStatus\fP *rc, char *str, int uri)"
.br
.ti -1c
.RI "char * \fBvalue2CharsUri\fP (\fBCMPIType\fP type, \fBCMPIValue\fP *value, int uri)"
.br
.ti -1c
.RI "char * \fBvalue2Chars\fP (\fBCMPIType\fP type, \fBCMPIValue\fP *value)"
.br
.ti -1c
.RI "char * \fBkeytype2Chars\fP (\fBCMPIType\fP type)"
.br
.ti -1c
.RI "\fBCMPIValue\fP * \fBgetKeyValueTypePtr\fP (char *type, char *value, \fBXtokValueReference\fP *ref, \fBCMPIValue\fP *val, \fBCMPIType\fP *typ)"
.br
.ti -1c
.RI "\fBCMPIType\fP \fBguessType\fP (char *val)"
.br
.ti -1c
.RI "\fBCMPIValue\fP \fBstr2CMPIValue\fP (\fBCMPIType\fP type, char *val, \fBXtokValueReference\fP *ref)"
.br
.in -1c
.SH DESCRIPTION
.PP 
CMPIValue class implementation, representing the Encapsulated value objects. 

This is the native CMPIValue implementation as used for remote providers. It reflects the well-defined interface of a regular CMPIValue, however, it works independently from the management broker.
.PP
It is part of a native broker implementation that simulates CMPI data types rather than interacting with the entities in a full-grown CIMOM.
.SH "SEE ALSO"
Common Manageability Programming Interface (CMPI) - OpenGroup

[Sblim-commit] sfcc/man/man3 - New directory

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

Update of /cvsroot/sblim/sfcc/man/man3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2416/man3

Log Message:
Directory /cvsroot/sblim/sfcc/man/man3 added to the repository

[Sblim-commit] sfcc/man - New directory

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

Update of /cvsroot/sblim/sfcc/man
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2345/man

Log Message:
Directory /cvsroot/sblim/sfcc/man added to the repository

[Sblim-commit] sfcb cimXmlGen.c,1.11,1.12 cimXmlGen.h,1.1,1.2 cimXmlOps.y,1.6,1.7 cimXmlRequest.c,1.14,1.15 objectImpl.c,1.9,1.10

[Adrian S. <a3s...@us...>]

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

Modified Files:
	cimXmlGen.c cimXmlGen.h cimXmlOps.y cimXmlRequest.c 
	objectImpl.c 
Log Message:
Fixed [ 1223687 ] getclass ignore IncludeQualifier flag


Index: cimXmlOps.y
===================================================================
RCS file: /cvsroot/sblim/sfcb/cimXmlOps.y,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- cimXmlOps.y	21 May 2005 21:39:21 -0000	1.6
+++ cimXmlOps.y	15 Jul 2005 15:01:55 -0000	1.7
@@ -47,15 +47,6 @@
 extern int yylex (void *lvalp, ParserControl *parm);
 
 
-int isBoolean(CMPIData data)
-{
-   if (data.type==CMPI_chars) {
-      if (strcasecmp(data.value.chars,"true")==0) return 0xffff;
-      if (strcasecmp(data.value.chars,"false")==0) return 0;
-   }
-   return -1;
-}
-
 static void setRequest(void *parm, void *req, unsigned long size, int type)
 {
    ((ParserControl*)parm)->reqHdr.cimRequestLength=size;
@@ -2099,8 +2090,8 @@
 boolValue
     : XTOK_VALUE ZTOK_VALUE
     {
-//       int b=isBoolean($1.val);
-//       if (b>=0) $$=(b!=0);
+    if (strcasecmp($1.value,"true")==0) $$=1;
+    if (strcasecmp($1.value,"false")==0) $$=0;
     }
 ;
 

Index: cimXmlGen.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/cimXmlGen.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- cimXmlGen.c	13 Jul 2005 14:26:01 -0000	1.11
+++ cimXmlGen.c	15 Jul 2005 15:01:54 -0000	1.12
@@ -645,7 +645,8 @@
       sb->ft->appendChars(sb, superCls);
    }
    sb->ft->appendChars(sb, "\">\n");
-   quals2xml(cl->quals, sb);
+   if (flags & FL_includeQualifiers) quals2xml(cl->quals, sb);
+   
    if (flags & FL_includeQualifiers)
       for (i = 0, m = ClClassGetQualifierCount(cl); i < m; i++) {
          data = cls->ft->getQualifierAt(cls, i, &name, NULL);
@@ -655,7 +656,7 @@
    for (i = 0, m = ClClassGetPropertyCount(cl); i < m; i++) {
       qsb->ft->reset(qsb);
       data = cls->ft->getPropertyAt(cls, i, &name, &quals, NULL);
-      quals2xml(quals << 8, qsb);
+      if (flags & FL_includeQualifiers) quals2xml(quals << 8, qsb);
       if (flags & FL_includeQualifiers)
          for (q = 0, qm = ClClassGetPropQualifierCount(cl, i); q < qm; q++) {
             qdata = cls->ft->getPropQualifierAt(cls, i, q, &qname, NULL);
@@ -711,7 +712,7 @@
    _SFCB_RETURN(0);
 }
 
-int instance2xml(CMPIInstance * ci, UtilStringBuffer * sb)
+int instance2xml(CMPIInstance * ci, UtilStringBuffer * sb, unsigned int flags)
 {
    ClInstance *inst = (ClInstance *) ci->hdl;
    int i, m = ClInstanceGetPropertyCount(inst);
@@ -723,6 +724,8 @@
    sb->ft->appendChars(sb, "<INSTANCE CLASSNAME=\"");
    sb->ft->appendChars(sb, instGetClassName(ci));
    sb->ft->appendChars(sb, "\">\n");
+   
+   if (flags & FL_includeQualifiers) quals2xml(inst->quals, sb);
 
    for (i = 0; i < m; i++) {
       CMPIString *name;
@@ -873,7 +876,7 @@
          instanceName2xml(cop, sb);
          if (xmlAs==XML_asObj)
             sb->ft->appendChars(sb, "</INSTANCEPATH>\n");
-         instance2xml(ci, sb);
+         instance2xml(ci, sb, flags);
          if (xmlAs==XML_asObj)
             sb->ft->appendChars(sb, "</VALUE.OBJECTWITHPATH>\n");
          else

Index: objectImpl.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/objectImpl.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- objectImpl.c	13 Jul 2005 14:26:02 -0000	1.9
+++ objectImpl.c	15 Jul 2005 15:01:55 -0000	1.10
@@ -1142,7 +1142,7 @@
    return sc->str + o;
 }
 
-int instance2xml(CMPIInstance * ci, UtilStringBuffer * sb);
+int instance2xml(CMPIInstance * ci, UtilStringBuffer * sb, unsigned int flags);
 
 static long sizeProperties(ClObjectHdr * hdr, ClSection * s)
 {
@@ -1156,7 +1156,7 @@
          if ((p->flags & ClProperty_EmbeddedObjectAsString)==0) {
             p->flags|=ClProperty_EmbeddedObjectAsString;
             sb = UtilFactory->newStrinBuffer(1024);
-            instance2xml(p->data.value.inst,sb);
+            instance2xml(p->data.value.inst,sb,0);
             p->data.value.dataPtr.length = addClString(hdr, sb->ft->getCharPtr(sb));
             sb->ft->release(sb);
          }

Index: cimXmlGen.h
===================================================================
RCS file: /cvsroot/sblim/sfcb/cimXmlGen.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cimXmlGen.h	12 Mar 2005 00:43:00 -0000	1.1
+++ cimXmlGen.h	15 Jul 2005 15:01:55 -0000	1.2
@@ -42,7 +42,7 @@
 extern int value2xml(CMPIData d, UtilStringBuffer * sb, int wv);
 extern int instanceName2xml(CMPIObjectPath * cop, UtilStringBuffer * sb);
 extern int cls2xml(CMPIConstClass * cls, UtilStringBuffer * sb, unsigned int flags);
-extern int instance2xml(CMPIInstance * ci, UtilStringBuffer * sb);
+extern int instance2xml(CMPIInstance * ci, UtilStringBuffer * sb, unsigned int flags);
 extern int args2xml(CMPIArgs * args, UtilStringBuffer * sb);
 extern int enum2xml(CMPIEnumeration * enm, UtilStringBuffer * sb, CMPIType type,
                     int xmlAs, unsigned int flags);

Index: cimXmlRequest.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/cimXmlRequest.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- cimXmlRequest.c	13 Jul 2005 14:26:02 -0000	1.14
+++ cimXmlRequest.c	15 Jul 2005 15:01:55 -0000	1.15
@@ -378,7 +378,7 @@
        {0, exportIndTrailer1}} };
        
    _SFCB_ENTER(TRACE_CIMXMLPROC, "exportIndicationReq");
-   instance2xml(ci, sb);
+   instance2xml(ci, sb, 0);
   _SFCB_RETURN(xs);
 };
  
@@ -545,7 +545,7 @@
       if (resp->rc == CMPI_RC_OK) { 
          cls = relocateSerializedConstClass(resp->object[0].data);
          sb = UtilFactory->newStrinBuffer(1024);
-         cls2xml(cls, sb,binCtx.bHdr->flags);
+         cls2xml(cls, sb, binCtx.bHdr->flags);
          _SFCB_RETURN(iMethodResponse(hdr, sb));
       }
       _SFCB_RETURN(iMethodErrResponse(hdr, getErrSegment(resp->rc, 
@@ -898,7 +898,7 @@
       if (resp->rc == CMPI_RC_OK) {
          inst = relocateSerializedInstance(resp->object[0].data);
          sb = UtilFactory->newStrinBuffer(1024);
-         instance2xml(inst, sb);
+         instance2xml(inst, sb, binCtx.bHdr->flags);
          rsegs=iMethodResponse(hdr, sb);
          _SFCB_RETURN(rsegs);
       }

[Sblim-commit] ecute/Plugin/com/ibm/ecute/rsa/ui/internal/wizards/command RSAOutputOperation.java,1.6,1.7

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

Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/ui/internal/wizards/command
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30178/Plugin/com/ibm/ecute/rsa/ui/internal/wizards/command

Modified Files:
	RSAOutputOperation.java 
Log Message:
Qualifier flavors:
qualifier values of qualifiers "Aggregation", "Composition",
"Aggregate", "Min", "Max" and "Key" on references are 
inherited by subclasses on MOF import

Index: RSAOutputOperation.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/ui/internal/wizards/command/RSAOutputOperation.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- RSAOutputOperation.java	11 Jul 2005 07:29:20 -0000	1.6
+++ RSAOutputOperation.java	15 Jul 2005 13:43:39 -0000	1.7
@@ -136,12 +136,6 @@
 	        FlavorsHelper flavorsHelper = new FlavorsHelper(uml2Model);
 	        flavorsHelper.setModelFlavors();
 
-//	        FlavorsHelper flavorsHelper = new FlavorsHelper(uml2Model);
-//	        Package package_ = (Package)uml2Model.getOwnedMember("Cisco_LogicalPhysicalCore");
-//	        Class class2 = (Class)package_.getOwnedMember("Cisco_Asset");
-//        	ArrayList parents = flavorsHelper.getAllParentClasses(class2);
-//        	ArrayList children = flavorsHelper.getAllChildClasses(class2);
-            
         	if(monitor.isCanceled()){
                 throw  new InterruptedException();
             }

[Sblim-commit] ecute/Plugin/com/ibm/ecute/UMLBuffer UMLBuffer.java,1.9,1.10

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

Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/UMLBuffer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30178/Plugin/com/ibm/ecute/UMLBuffer

Modified Files:
	UMLBuffer.java 
Log Message:
Qualifier flavors:
qualifier values of qualifiers "Aggregation", "Composition",
"Aggregate", "Min", "Max" and "Key" on references are 
inherited by subclasses on MOF import

Index: UMLBuffer.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/UMLBuffer/UMLBuffer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- UMLBuffer.java	7 Jul 2005 15:42:49 -0000	1.9
+++ UMLBuffer.java	15 Jul 2005 13:43:39 -0000	1.10
@@ -42,12 +42,21 @@
 	private static final String COPYRIGHT = License.COPYRIGHT;
 	private UMLFile mainFile;
 	private UMLClass lastClass = null;
+	private UMLClass lastAssociationClass = null;
 	private UMLFile lastFile = null;
 	private UMLMethod lastMethod = null;
 	private UMLRole lastRole1 = null;
 	private UMLRole lastRole2 = null;
 	private UMLQualified lastAddedElement = null;
 	boolean aggregateRole1 = true;
+	//boolean parentAggregates = false;
+	UMLClass parentAggregateClass = null;
+	boolean inheritedAggregate = false;
+	boolean isFirstAggregate = false;
+	boolean parentTwisted = false;
+	boolean parentRole1Aggregates = false;
+	boolean parentRole2Aggregates = false;
+	boolean thisClassAggregates = false;
 	boolean ready = false;
 	private ProgressFrame log;
 	public UMLBuffer(ProgressFrame log) {
@@ -127,9 +136,17 @@
 	public void SetQualifier(int type, String name, String defaultValue) {
 		UMLQualifier theQualifier = new UMLQualifier(name, defaultValue);
 		if (type == TLINK1)
-			lastRole1.addQualifier(theQualifier);
+//			if(!parentTwisted){
+				lastRole1.addQualifier(theQualifier);
+//			} else {
+//				lastRole2.addQualifier(theQualifier);
+//			}
 		else if (type == TLINK2)
-			lastRole2.addQualifier(theQualifier);
+//			if(!parentTwisted){
+				lastRole2.addQualifier(theQualifier);
+//			} else {
+//				lastRole1.addQualifier(theQualifier);
+//			}
 		else if (lastAddedElement != null)
 			lastAddedElement.addQualifier(theQualifier);
 		else
@@ -506,6 +523,90 @@
 		return leftClasses;
 	}
 	void CreateQualifiers(UMLQualified qualifiedElement) {
+
+		if (UMLProgram instanceof RSAModelCreator){
+			// set UMLClass attribute, if the references are twisted
+			// required for flavor inheritance
+			if (qualifiedElement.getType() == TCLASS &&
+					((UMLClass)qualifiedElement).getRole1() != null &&
+					((UMLClass)qualifiedElement).getRole2() != null){
+				if(((UMLClass)qualifiedElement).getBaseUMLClass() == null){ //TODO change this condition
+					
+					parentAggregateClass = (UMLClass)qualifiedElement;
+					
+//					if(((UMLClass)qualifiedElement).getRole2().getQualifier("Aggregate", true) != null){
+//						parentTwisted = true;
+//						//parentRole2Aggregates = true;
+//					} else if(((UMLClass)qualifiedElement).getRole1().getQualifier("Aggregate", true) != null){
+//						parentTwisted = false;
+//						//parentRole1Aggregates = true;
+//					} else {
+//						parentTwisted = false;
+//					}
+					
+					//isFirstAggregate = true;
+					
+				} //else {
+				//	isFirstAggregate = false;
+				//}
+				
+			}
+			
+			if (qualifiedElement.getType() == TCLASS 
+					&& ((UMLClass)qualifiedElement).getRole1() != null 
+					&& ((UMLClass)qualifiedElement).getRole2() != null 
+					&& ((UMLClass)qualifiedElement).getBaseUMLClass() != null
+					&& ((UMLClass)qualifiedElement).getQualifier("Aggregation", true) == null 
+					&& ((UMLClass)qualifiedElement).getQualifier("Composition", true) == null){
+
+				UMLClass thisClass		= (UMLClass)qualifiedElement;
+				UMLClass parentClass 	= ((UMLClass)qualifiedElement).getBaseUMLClass(); 
+				if(parentClass.getQualifier("Aggregation", true) != null && thisClass.getQualifier("Aggregation", true) == null){
+					thisClass.getQualifiers(true).add(parentClass.getQualifier("Aggregation", true));
+				}
+				if(parentClass.getQualifier("Composition", true) != null && thisClass.getQualifier("Composition", true) == null){
+					thisClass.getQualifiers(true).add(parentClass.getQualifier("Composition", true));
+				}
+
+			}
+			
+			if((qualifiedElement.getType() == TLINK1 || qualifiedElement.getType() == TLINK2) 
+					&& lastAssociationClass.getBaseUMLClass() != null 
+					&& lastAssociationClass.getBaseUMLClass().getRole1() != null 
+					&& lastAssociationClass.getBaseUMLClass().getRole2() != null){
+				
+				UMLRole role = (UMLRole)qualifiedElement;
+				UMLClass parentAssociationClass = lastAssociationClass.getBaseUMLClass();
+
+				if(qualifiedElement.getType() == TLINK1){
+					UMLRole parentRole1 = parentAssociationClass.getRole1();
+					
+					if(role.getQualifier("Min", true) == null && parentRole1.getQualifier("Min", true) != null){
+						role.getQualifiers(true).add(parentRole1.getQualifier("Min", true));
+					}
+					if(role.getQualifier("Max", true) == null && parentRole1.getQualifier("Max", true) != null){
+						role.getQualifiers(true).add(parentRole1.getQualifier("Max", true));
+					}
+					if(role.getQualifier("Key", true) == null && parentRole1.getQualifier("Key", true) != null){
+						role.getQualifiers(true).add(parentRole1.getQualifier("Key", true));
+					}
+					
+				} else if(qualifiedElement.getType() == TLINK2){
+					UMLRole parentRole2 = parentAssociationClass.getRole2();
+					
+					if(role.getQualifier("Min", true) == null && parentRole2.getQualifier("Min", true) != null){
+						role.getQualifiers(true).add(parentRole2.getQualifier("Min", true));
+					}
+					if(role.getQualifier("Max", true) == null && parentRole2.getQualifier("Max", true) != null){
+						role.getQualifiers(true).add(parentRole2.getQualifier("Max", true));
+					}
+					if(role.getQualifier("Key", true) == null && parentRole2.getQualifier("Key", true) != null){
+						role.getQualifiers(true).add(parentRole2.getQualifier("Key", true));
+					}
+				}
+			}				
+		}
+		
 		ArrayList qualifiers = qualifiedElement.getQualifiers(!completeClasses);
 		for (int i = 0; i < qualifiers.size(); i++) {
 			UMLQualifier theQualifier = (UMLQualifier) qualifiers.get(i);
@@ -514,7 +615,7 @@
 				// if the aggregation/composition is defined in the second role of a association class
 				// then the qualifiers have to be added to the other end of the association
 				// (in this case the addAssociation mehtod is also called the other way round
-				if (aggregateRole1 == false && qualifiedElement.getType() == TLINK1){
+				if (aggregateRole1 == false	&& qualifiedElement.getType() == TLINK1){
 					UMLProgram.SetQualifier(TLINK2, theQualifier.name, theQualifier.value);
 				} else if (aggregateRole1 == false && qualifiedElement.getType() == TLINK2){
 					UMLProgram.SetQualifier(TLINK1, theQualifier.name, theQualifier.value);
@@ -559,9 +660,13 @@
 		}
 	}
 	int CreateAssociation(UMLClass theClass) {
-		if (!theClass.isAssociation())
+		if (!theClass.isAssociation()){
 			//Nothing to do
 			return OK;
+		} else {
+			lastAssociationClass = theClass;
+		}
+		
 		UMLRole role1 = theClass.getRole1();
 		UMLRole role2 = theClass.getRole2();
 		
@@ -569,39 +674,86 @@
 			int result = -1;
 			// RSA
 			if (UMLProgram instanceof RSAModelCreator){
-				
 				boolean aggregate = false;
 				
-				// get the first qualifier of each association role to find out
+
+				
+				// BB - set the aggregate diamond on the correct side of the association
+				// for normal and inherited associations
+				if(role1.getQualifier("Aggregate", true) == null &&	role2.getQualifier("Aggregate", true) == null){
+					
+					if(parentAggregateClass != null && parentAggregateClass.getRole1() != null 
+							&& parentAggregateClass.getRole2() != null
+							/*theClass.getBaseUMLClass() != null && theClass.getBaseUMLClass().getRole1() != null 
+							&& theClass.getBaseUMLClass().getRole2() != null*/ ){
+						
+						
+						//UMLClass parentAggregateClass = theClass.getBaseUMLClass();
+						UMLRole parentRole1 = parentAggregateClass.getRole1();
+						UMLRole parentRole2 = parentAggregateClass.getRole2();
+						
+						if(parentRole1.getQualifier("Aggregate", true) != null /*&& !parentTwisted*/){
+							role1.getQualifiers(true).add(parentRole1.getQualifier("Aggregate", true));
+							//parentTwisted = true;
+						/*} else if(parentRole1.getQualifier("Aggregate", true) != null && parentTwisted){
+							role2.getQualifiers(true).add(parentRole1.getQualifier("Aggregate", true));
+							//parentTwisted = false;
+						} else if(parentRole2.getQualifier("Aggregate", true) != null && !parentTwisted){
+							role2.getQualifiers(true).add(parentRole2.getQualifier("Aggregate", true));
+							//parentTwisted = true;*/
+						} else if(parentRole2.getQualifier("Aggregate", true) != null /*&& parentTwisted*/){
+							role2.getQualifiers(true).add(parentRole2.getQualifier("Aggregate", true));
+							//parentTwisted = false;
+						}
+						
+						//inheritedAggregate = true;
+					} /*else {
+						inheritedAggregate = false;
+					}*/
+				}
+
+				//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+				// BB- this part influences the direction of the association in the property view +
+				//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+				
+				// check the qualifiers of each association role to find out
 				// in which role the aggregate is defined 
 				ArrayList qualifiers1 = role1.getQualifiers(true);
 				if(qualifiers1.size() > 0){
-					UMLQualifier role1Qualifier = (UMLQualifier) qualifiers1.get(0);
-					//if aggregate is defined in role 1 (MOF file) then AddAssociation is 
-					// called with role 2 first to get the diamond on the correct end of the
-					// association (the diamond is in RSA on the side of the second role 
-					// which is passed to AddAssociation)
-					if (role1Qualifier.name.equalsIgnoreCase("Aggregate")){
-						//System.out.println("Role 1 is AGGREGATE");
-						aggregate = true;
-						aggregateRole1 = true;
-						result = UMLProgram.AddAssociation(role2.endPointName,
-								role2.name, role1.endPointName, role1.name, RclassDiagram);
+					for(int i = 0; i < qualifiers1.size(); i++){
+						UMLQualifier role1Qualifier = (UMLQualifier) qualifiers1.get(i);
+						//if aggregate is defined in role 1 (MOF file) then AddAssociation is 
+						// called with role 2 first to get the diamond on the correct end of the
+						// association (the diamond is in RSA on the side of the second role 
+						// which is passed to AddAssociation)
+						if (role1Qualifier.name.equalsIgnoreCase("Aggregate") /*&& isFirstAggregate || parentRole1Aggregates*/){
+							//System.out.println("Role 1 is AGGREGATE");
+							aggregate = true;
+							//if(!inheritedAggregate)
+								aggregateRole1 = true;
+							result = UMLProgram.AddAssociation(role2.endPointName,
+									role2.name, role1.endPointName, role1.name, RclassDiagram);
+							break;
+						}
 					}
 				}
 				ArrayList qualifiers2 = role2.getQualifiers(true);
 				if(qualifiers2.size() > 0){
-					UMLQualifier role2Qualifier = (UMLQualifier) qualifiers2.get(0);
-				
-					// if aggregate is defined in role 2 (MOF file)
-					// aggregateRole1 is set to false to get the qualifiers (with SetQualifiers)
-					// to the correct end of the aggregation/composition
-					if (role2Qualifier.name.equalsIgnoreCase("Aggregate")){
-						//System.out.println("Role 2 is AGGREGATE");
-						aggregate = true;
-						aggregateRole1 = false;
-						result = UMLProgram.AddAssociation(role1.endPointName,
-								role1.name, role2.endPointName, role2.name, RclassDiagram);
+					for(int i = 0; i < qualifiers2.size(); i++){
+						UMLQualifier role2Qualifier = (UMLQualifier) qualifiers2.get(i);
+						
+						// if aggregate is defined in role 2 (MOF file)
+						// aggregateRole1 is set to false to get the qualifiers (with SetQualifiers)
+						// to the correct end of the aggregation/composition
+						if (role2Qualifier.name.equalsIgnoreCase("Aggregate") /*|| parentRole2Aggregates*/){
+							//System.out.println("Role 2 is AGGREGATE");
+							aggregate = true;
+							//if(!inheritedAggregate)
+								aggregateRole1 = false;
+							result = UMLProgram.AddAssociation(role1.endPointName,
+									role1.name, role2.endPointName, role2.name, RclassDiagram);
+							break;
+						}
 					}
 				}
 				// if the association is no aggregation or composition
@@ -610,17 +762,19 @@
 					//System.out.println("Role 1 end point = " + role1.endPointName + " Role 1 name = " + role1.name);
 					//System.out.println("Role 2 end point = " + role2.endPointName + " Role 2 name = " + role2.name);
 					aggregateRole1 = true;
+					
 					result = UMLProgram.AddAssociation(role2.endPointName,
 							role2.name, role1.endPointName, role1.name, RclassDiagram);
 				}
+				 
 			// ROSE
 			} else {
 				result = UMLProgram.AddAssociation(role1.endPointName,
 					role1.name, role2.endPointName, role2.name, RclassDiagram);
 			}
-			// create the qulifiers of the roles
-			// it doesn't matter if the qualifiers of role 1 are created 
-			// first or not
+//			 create the qualifiers of the roles
+//			 it doesn't matter if the qualifiers of role 1 are created 
+//			 first or not
 			if (result == OK) {
 				CreateQualifiers(role1);
 				CreateQualifiers(role2);

[Sblim-commit] ecute/Plugin/com/ibm/ecute/plugins/output/funcionality RSAModelCreator.java,1.15,1.16

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

Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/plugins/output/funcionality
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30178/Plugin/com/ibm/ecute/plugins/output/funcionality

Modified Files:
	RSAModelCreator.java 
Log Message:
Qualifier flavors:
qualifier values of qualifiers "Aggregation", "Composition",
"Aggregate", "Min", "Max" and "Key" on references are 
inherited by subclasses on MOF import

Index: RSAModelCreator.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/plugins/output/funcionality/RSAModelCreator.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- RSAModelCreator.java	11 Jul 2005 07:29:19 -0000	1.15
+++ RSAModelCreator.java	15 Jul 2005 13:43:38 -0000	1.16
@@ -110,6 +110,7 @@
     private IUMLDiagramHelper diagramHelper;
     
     //private FlavorsHelper flavorsHelper;
+    private boolean associationTwisted = false;
     
     private QualifiersList qualifiersList = null;
    
@@ -122,14 +123,6 @@
         leftDataTypes = new Hashtable();
         leftDataTypeKeys = new ArrayList();
         diagramHelper = UMLModeler.getUMLDiagramHelper();
-//        flavorsHelper = new FlavorsHelper(uml2Model);
-//        if(!flavorsHelper.existsQualifierListConstraint()){
-//        	flavorsHelper.createQualifiersListConstraint();
-//        }
-//        qualifiersList = flavorsHelper.getQualifiersList();
-//        Qualifier qualifier = qualifiersList.GetElement("Override");
-//        String flavor = qualifier.stringFlavor();
-//        boolean test = flavorsHelper.isNativeMappedQualifier("bender");
     }
 
     public int AddAssociation(String className1, String roleName1, String className2, String roleName2, Object diagram) {
@@ -143,6 +136,13 @@
         
         lastClass = associationclass;
         lastElement = associationclass;
+        
+        
+//        if(lastAssocProp2 != null && roleName1.equalsIgnoreCase(lastAssocProp2.getName())){
+//        	associationTwisted = true;
+//        } else {
+//        	associationTwisted = false;
+//        }
 
         if (className1 == null || className2 == null) {
             if (lastRootClass != null) {
@@ -240,18 +240,21 @@
 //            }
 //        }
         
-        if ((className1 == null) || (className2 == null))
+        if ((className1 == null) || (className2 == null)){
 			return NOLINKS;
+        }
 
         //Create Association
         Type type1 = getClass(className1, lastCategory, true);
-        if (type1 == null)
+        if (type1 == null){
             return NOLINK1;
-
+        }
+        
         Type type2 = getClass(className2, lastCategory, true);
-        if (type2 == null)
+        if (type2 == null){
             return NOLINK2;
-
+        }
+        
         Property assocProp1 = associationclass.createOwnedEnd(UML2Package.eINSTANCE.getProperty());
         assocProp1.setType(type1);
         assocProp1.setName(roleName1);
@@ -605,15 +608,23 @@
         // because of the different role order in RSA theElement is
         // lastAssocProp2 if type TLINK1
         if (type == TLINK1) {
-        	//theElement = lastAssocProp1;
-        	theElement = lastAssocProp2;
-            otherElement = lastAssocProp1;
+//        	if(associationTwisted){
+//        		theElement = lastAssocProp1;
+//        		otherElement = lastAssocProp2;
+//        	} else {
+        		theElement = lastAssocProp2;
+        		otherElement = lastAssocProp1;
+        	//}
         }
         // lastAssocProp1 if type TLINK2
         if (type == TLINK2) {
-        	//theElement = lastAssocProp2;
-        	theElement = lastAssocProp1;
-            otherElement = lastAssocProp2;            
+//        	if(associationTwisted){
+//        		theElement = lastAssocProp2;
+//        		otherElement = lastAssocProp1;
+//        	} else {
+        		theElement = lastAssocProp1;
+        		otherElement = lastAssocProp2;
+//        	}
         }
 
         if (name.equalsIgnoreCase("Description") && qualifiers) {

[Sblim-commit] ecute/Plugin/com/ibm/ecute/rsa/core/internal/properties FlavorsHelper.java,1.1,1.2

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

Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/core/internal/properties
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30178/Plugin/com/ibm/ecute/rsa/core/internal/properties

Modified Files:
	FlavorsHelper.java 
Log Message:
Qualifier flavors:
qualifier values of qualifiers "Aggregation", "Composition",
"Aggregate", "Min", "Max" and "Key" on references are 
inherited by subclasses on MOF import

Index: FlavorsHelper.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/core/internal/properties/FlavorsHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FlavorsHelper.java	7 Jul 2005 15:42:49 -0000	1.1
+++ FlavorsHelper.java	15 Jul 2005 13:43:39 -0000	1.2
@@ -12,6 +12,7 @@
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.uml2.AggregationKind;
 import org.eclipse.uml2.AssociationClass;
 import org.eclipse.uml2.Class;
 import org.eclipse.uml2.Constraint;
@@ -70,11 +71,60 @@
 	}
 	
 	private void setClassFlavors(Class class_){
+		ArrayList parentClasses = getAllParentClasses(class_);
+		
 		ArrayList overrideAttributes = getOverrideAttributes(class_);
 		ArrayList overrideMethods = getOverrideMethods(class_);
 		ArrayList overrideReferences = getOverrideReferences(class_);
 		
-		System.out.println("Juhuu!!!");
+//		if(class_ instanceof AssociationClass && overrideReferences.size() > 0){
+//			AssociationClass aClass = (AssociationClass)class_;
+//			setAssociationClassFlavors(aClass, parentClasses, overrideReferences);
+//		}
+	}
+	
+	private void setAssociationClassFlavors(AssociationClass aClass, ArrayList parentClasses, ArrayList overrideReferences){
+		
+		// check if "aggregate" is set in association ends 
+		List associationEnds = aClass.getOwnedEnds();
+		for(int i = 0; i < associationEnds.size(); i++){
+			Property associationEnd = (Property)associationEnds.get(i);
+			if(associationEnd.getAggregation().getValue() == AggregationKind.SHARED ||
+					associationEnd.getAggregation().getValue() == AggregationKind.COMPOSITE){
+				return;
+			}
+		}
+
+		// if association is a normal association and not a aggregation or
+		// composition then check the parents if they are aggregation or composition
+		for(int k = 0; k < parentClasses.size(); k++){
+			
+			//Class parentClass = (Class)parentClasses.get(k);
+			
+			if(parentClasses.get(k) instanceof AssociationClass){
+				
+				
+				//Property assocEnd2 = (Property)aClass.getOwnedEnds().get(1);
+				
+				AssociationClass parentClass = (AssociationClass)parentClasses.get(k);
+				
+				for(int i = 0; i < overrideReferences.size(); i++){
+				
+					Property assocEnd = (Property)overrideReferences.get(i);
+					
+				Property parentClassEnd = parentClass.getOwnedEnd(assocEnd.getName());//(Property)parentClassEnds.get(0);
+				//Property parentClassEnd2 = parentClass.getOwnedEnd(assocEnd2.getName());//(Property)parentClassEnds.get(1);
+
+				
+//					assocEnd.setAggregation(parentClassEnd.getAggregation());
+//					assocEnd.setLowerBound(parentClassEnd.getLower());
+//					assocEnd.setUpperBound(parentClassEnd.getUpper());
+				}
+					
+
+			}
+		}
+		return;
 	}
 	
 	private boolean existsQualifierListConstraint(){
@@ -390,6 +440,16 @@
 		}	
 	}
 	
+	private Class getParentClass(Class class_){
+		
+		List parents = class_.getGenerals();
+		if(parents.size() > 0){
+			return (Class)parents.get(0);
+		} else {
+			return null;
+		}
+	}
+	
 	private String overrides(NamedElement namedElement){
 		
 		Stereotype cimStereotype = namedElement.getAppliedStereotype("CIM::Qualifiers");

[Sblim-commit] ecute/Plugin/com/ibm/ecute/UMLBuffer/UMLTree UMLClass.java,1.5,1.6

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

Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/UMLBuffer/UMLTree
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30178/Plugin/com/ibm/ecute/UMLBuffer/UMLTree

Modified Files:
	UMLClass.java 
Log Message:
Qualifier flavors:
qualifier values of qualifiers "Aggregation", "Composition",
"Aggregate", "Min", "Max" and "Key" on references are 
inherited by subclasses on MOF import

Index: UMLClass.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/UMLBuffer/UMLTree/UMLClass.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- UMLClass.java	30 Dec 2004 13:32:57 -0000	1.5
+++ UMLClass.java	15 Jul 2005 13:43:39 -0000	1.6
@@ -49,6 +49,7 @@
 	private boolean isAssociation = false;
 	private UMLRole role1 = null;
 	private UMLRole role2 = null;
+	private boolean rolesTwisted = false;
 
 	private Hashtable methods = new Hashtable();
 	private Hashtable attributes = new Hashtable();
@@ -138,6 +139,18 @@
 	public UMLRole getRole2() {
 		return role2;
 	}
+	
+	public boolean getRolesTwisted(){
+		return rolesTwisted;
+	}
+	
+	public void setRolesTwisted(){
+		rolesTwisted = true;
+	}
+	
+	public void resetRolesTwisted(){
+		rolesTwisted = false;
+	}
 
 	public void addMethod(UMLMethod method) {
 		methods.put(method.getName(), method);

[Sblim-commit] sfcb/test enumerateclasses.FIRSTTIME.OK,1.1,1.2

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

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

Modified Files:
	enumerateclasses.FIRSTTIME.OK 
Log Message:
added
	connection: close
to expected result


Index: enumerateclasses.FIRSTTIME.OK
===================================================================
RCS file: /cvsroot/sblim/sfcb/test/enumerateclasses.FIRSTTIME.OK,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- enumerateclasses.FIRSTTIME.OK	18 May 2005 04:51:38 -0000	1.1
+++ enumerateclasses.FIRSTTIME.OK	15 Jul 2005 00:18:31 -0000	1.2
@@ -3,6 +3,7 @@
 Content-Length: 295
 Cache-Control: no-cache
 CIMOperation: MethodResponse
+Connection: close
 
 
 <?xml version="1.0" encoding="utf-8" ?>

[Sblim-commit] cmpi-tests/cmpi-instancetest/schema TST_InstanceProperties.mof,1.1.1.1,1.2

[yeechan <ibm...@us...>]

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

Modified Files:
	TST_InstanceProperties.mof 
Log Message:
defect#1238362


Index: TST_InstanceProperties.mof
===================================================================
RCS file: /cvsroot/sblim/cmpi-tests/cmpi-instancetest/schema/TST_InstanceProperties.mof,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- TST_InstanceProperties.mof	4 May 2005 01:03:46 -0000	1.1.1.1
+++ TST_InstanceProperties.mof	14 Jul 2005 18:19:35 -0000	1.2
@@ -13,7 +13,10 @@
    /* EXPAND THIS CLASS BY DEFINING MORE PROPERTIES HERE */
 
    [Maxlen(256), Description ("a string property")]
-   string Property_string;
+   string Property_string1;
+
+   [Maxlen(256), Description ("a string property")]
+   string Property_string2;
 
    [Description ("a uint8 property")]
    uint8 Property_uint8;

[Sblim-commit] cmpi-base/test/system/linux Linux_OperatingSystemStatisticalData.system,NONE,1.1 Linux_OperatingSystemStatistics.system,NONE,1.1

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

Update of /cvsroot/sblim/cmpi-base/test/system/linux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15355/test/system/linux

Added Files:
	Linux_OperatingSystemStatisticalData.system 
	Linux_OperatingSystemStatistics.system 
Log Message:
Bugs fixed: 1236584. Added new test files for statistical data, fixed
test script non-local invokation.


--- NEW FILE: Linux_OperatingSystemStatisticalData.system ---
********************************************************************************
class : Linux_OperatingSystemStatisticalData

--------------------------------------------------------------------------------
Linux_OperatingSystemStatisticalData : -eq 1

--------------------------------------------------------------------------------
InstanceId : -set

Caption : -set
Description : -set
ElementName : -eq -file OperatingSystem.keys[1]

StartStatisticTime : -set
StatisticTime : -set
CPUUserTime : -set
CPUSystemTime : -set
CPUWaitTime : -set
CPUIdleTime : -set
RunQueueLength : -set
BlockQueueLength : -set
PagesPagedIn : -set
PagesPagedOut : -set

--- NEW FILE: Linux_OperatingSystemStatistics.system ---
********************************************************************************
association : Linux_OperatingSystemStatistics

--------------------------------------------------------------------------------
Linux_OperatingSystem : -target Linux_OperatingSystemStatisticalData -eq 1
Linux_OperatingSystemStatisticalData : -target Linux_OperatingSystem -eq 1

[Sblim-commit] cmpi-base/test test-cmpi-base.sh,1.5,1.6

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

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

Modified Files:
	test-cmpi-base.sh 
Log Message:
Bugs fixed: 1236584. Added new test files for statistical data, fixed
test script non-local invokation.


Index: test-cmpi-base.sh
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/test/test-cmpi-base.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- test-cmpi-base.sh	12 Jul 2005 13:06:55 -0000	1.5
+++ test-cmpi-base.sh	14 Jul 2005 14:27:47 -0000	1.6
@@ -19,6 +19,7 @@
 declare -i max=8;
 declare -i i=0;
 
+cd $SCRIPT_PATH
 while(($i<=$max))
 do
   . ${SCRIPT_PATH}/run.sh ${CLASSNAMES[$i]} $1 $2 $3 $4 || exit 1;

[Sblim-commit] cmpi-base Makefile.am,1.7,1.8

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

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

Modified Files:
	Makefile.am 
Log Message:
Bugs fixed: 1236584. Added new test files for statistical data, fixed
test script non-local invokation.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.am	26 Apr 2005 16:39:39 -0000	1.7
+++ Makefile.am	14 Jul 2005 14:27:47 -0000	1.8
@@ -188,6 +188,8 @@
 	test/system/linux/Linux_OSProcess.system \
 	test/system/linux/Linux_OperatingSystem.system \
 	test/system/linux/Linux_Processor.system \
+	test/system/linux/Linux_OperatingSystemStatisticalData.system \
+	test/system/linux/Linux_OperatingSystemStatistics.system \
 	test/system/linux/Linux_RunningOS.system \
 	test/system/linux/Linux_UnixProcess.system 
 testsuitesystem_SCRIPTS=test/system/linux/Linux_OperatingSystem.version.sh \

[Sblim-commit] wbemcli ChangeLog,1.4,1.5 NEWS,1.4,1.5 configure.ac,1.10,1.11 sblim-wbemcli.spec.in,1.1,1.2

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

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

Modified Files:
	ChangeLog NEWS configure.ac sblim-wbemcli.spec.in 
Log Message:
Bugs fixed: 1236584. Added tarball name to configure.ac. Changed
copyright to License.


Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/wbemcli/NEWS,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- NEWS	1 Jun 2005 10:57:05 -0000	1.4
+++ NEWS	13 Jul 2005 14:51:43 -0000	1.5
@@ -4,6 +4,7 @@
 =========================
 Bugs:
 - 1184528 Fix key type recognition.
+- 1236584 RPM Build Enhancements
 
 Changes in Version 1.4.10
 =========================

Index: sblim-wbemcli.spec.in
===================================================================
RCS file: /cvsroot/sblim/wbemcli/sblim-wbemcli.spec.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sblim-wbemcli.spec.in	5 Apr 2005 12:11:19 -0000	1.1
+++ sblim-wbemcli.spec.in	13 Jul 2005 14:51:43 -0000	1.2
@@ -9,7 +9,7 @@
 Version: @PACKAGE_VERSION@
 Release: 0
 Group: Systems Management/Base
-Copyright: Common Public Licence http://oss.software.ibm.com/developerworks/opensource/license-cpl.html
+License: Common Public Licence 1.0
 Packager: Viktor Mihajlovski <mih...@de...>
 Source0: http://prdownloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/buildroot

Index: configure.ac
===================================================================
RCS file: /cvsroot/sblim/wbemcli/configure.ac,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- configure.ac	1 Jun 2005 10:57:05 -0000	1.10
+++ configure.ac	13 Jul 2005 14:51:43 -0000	1.11
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT(SBLIM WBEMCLI, 1.4.10a, sbl...@li...)
+AC_INIT(SBLIM WBEMCLI, 1.4.10b, sbl...@li...,sblim-wbemcli)
 AC_CONFIG_SRCDIR([CimXml.cpp])
 AC_CANONICAL_HOST
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/wbemcli/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ChangeLog	1 Jun 2005 10:57:05 -0000	1.4
+++ ChangeLog	13 Jul 2005 14:51:43 -0000	1.5
@@ -1,3 +1,11 @@
+2005-07-12    <mih...@dy...>
+
+	* configure.ac: 
+	Bug 1236584: add tarball name to AC_INIT macro (by Mark Hamzy).
+
+	* sblim-wbemcli.spec.in: 
+	Bug 1236584: replace Copyright by License tag (by Mark Hamzy).
+
 2005-06-01    <mih...@dy...>
 
 	* CimXml.cpp (toStringBuffer): 

[Sblim-commit] sfcb cimXmlGen.c,1.10,1.11 cimXmlRequest.c,1.13,1.14 configure.ac,1.14,1.15 instance.c,1.10,1.11 objectImpl.c,1.8,1.9 providerMgr.c,1.12,1.13 sqlStatement.c,1.1,1.2 support.c,1.6,1.7 trace.c,1.5,1.6

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

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

Modified Files:
	cimXmlGen.c cimXmlRequest.c configure.ac instance.c 
	objectImpl.c providerMgr.c sqlStatement.c support.c trace.c 
Log Message:
Bugs fixed: 1237336. Added CPU recognition to configure.ac. Replaced calls
to asm by a macro SFCB_ASM that expands to asm only for x86 hosts.


Index: trace.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/trace.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- trace.c	20 Jun 2005 13:09:44 -0000	1.5
+++ trace.c	13 Jul 2005 14:26:02 -0000	1.6
@@ -33,6 +33,7 @@
 #include <sys/resource.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include "config.h"
 
 /* ---------------------------------------------------------------------------*/
 /*                            trace facility                                  */
@@ -170,6 +171,7 @@
 
 void _sfcb_trap(int tn)
 {
+#ifdef SFCB_IX86
    char *tp;
    int t;
    if ((tp = getenv("SFCB_TRAP"))) {
@@ -177,6 +179,7 @@
       if (tn == t)
          asm("int $3");
    }
+#endif
 }
 
 sigHandler *setSignal(int sn, sigHandler * sh, int flags)

Index: configure.ac
===================================================================
RCS file: /cvsroot/sblim/sfcb/configure.ac,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- configure.ac	8 Jul 2005 14:01:51 -0000	1.14
+++ configure.ac	13 Jul 2005 14:26:02 -0000	1.15
@@ -82,6 +82,13 @@
 		;;
      **)	AC_MSG_ERROR([$ac_cv_host is not a supported platform, sorry.])
 esac
+
+
+case $host_cpu in
+     i*86)     AC_DEFINE(SFCB_IX86,1,[Intel i386 CPU])
+	       ;;     
+esac
+
 AC_SUBST(SFCB_CMPI_PLATFORM)
 AC_SUBST(SFCB_CMPI_OS)
 
@@ -134,7 +141,7 @@
 then 
    INIT_STYLE=init-suse
 else
-   INIT_STYLE=init-generic
+   INIT_STYLE=init-none
 fi
 AC_SUBST(INIT_STYLE)
 

Index: cimXmlGen.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/cimXmlGen.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- cimXmlGen.c	20 Jun 2005 23:59:24 -0000	1.10
+++ cimXmlGen.c	13 Jul 2005 14:26:01 -0000	1.11
@@ -36,6 +36,13 @@
 #include "string.h"
 
 #include "queryOperation.h"
+#include "config.h"
+
+#ifdef SFCB_IX86
+#define SFCB_ASM(x) asm(x)
+#else
+#define SFCB_ASM(x)
+#endif
 
 extern const char *instGetClassName(CMPIInstance * ci);
 extern CMPIData opGetKeyCharsAt(CMPIObjectPath * cop, unsigned int index,
@@ -195,7 +202,7 @@
    }
    mlogf(M_ERROR,M_SHOW,"%s(%d): invalid data type %d %x\n", __FILE__, __LINE__, (int) type,
           (int) type);
-   asm("int $3");
+   SFCB_ASM("int $3");
    abort();
    return "*??*";
 }
@@ -222,7 +229,7 @@
    }
    mlogf(M_ERROR,M_SHOW,"%s(%d): invalid key data type %d %x\n", __FILE__, __LINE__,
           (int) type, (int) type);
-   asm("int $3");
+   SFCB_ASM("int $3");
    abort();
    return "*??*";
 }

Index: cimXmlRequest.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/cimXmlRequest.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- cimXmlRequest.c	26 Jun 2005 21:52:08 -0000	1.13
+++ cimXmlRequest.c	13 Jul 2005 14:26:02 -0000	1.14
@@ -37,6 +37,13 @@
 #include "string.h"
 
 #include "queryOperation.h"
+#include "config.h"
+
+#ifdef SFCB_IX86
+#define SFCB_ASM(x) asm(x)
+#else
+#define SFCB_ASM(x)
+#endif
 
 typedef struct handler {
    RespSegments(*handler) (CimXmlRequestContext *, RequestHdr * hdr);
@@ -390,7 +397,7 @@
    _SFCB_ENTER(TRACE_CIMXMLPROC, "genEnumResponses");
 
    ar = NewCMPIArray(arrLen, binCtx->type, NULL);
-//asm("int $3");
+//SFCB_ASM("int $3");
    for (c = 0, i = 0; i < binCtx->rCount; i++) {
       for (j = 0; j < resp[i]->count; c++, j++) {
          if (binCtx->type == CMPI_ref)

Index: instance.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/instance.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- instance.c	12 Jul 2005 22:46:55 -0000	1.10
+++ instance.c	13 Jul 2005 14:26:02 -0000	1.11
@@ -29,6 +29,13 @@
 #include "native.h"
 
 #include "objectImpl.h"
+#include "config.h"
+
+#ifdef SFCB_IX86
+#define SFCB_ASM(x) asm(x)
+#else
+#define SFCB_ASM(x)
+#endif
 
 extern int ClInstanceGetPropertyAt(ClInstance * inst, int id, CMPIData * data,
                                    char **name, unsigned long *quals);
@@ -469,7 +476,7 @@
    
    else {
       j=0;
-      asm("int $3");
+      SFCB_ASM("int $3");
       ns = "*NoNameSpace*";
       cn = "*NoClassName*";
       tmp1.rc=tmp2.rc=tmp3.rc=CMPI_RC_OK;

Index: support.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/support.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- support.c	26 Apr 2005 21:58:47 -0000	1.6
+++ support.c	13 Jul 2005 14:26:02 -0000	1.7
@@ -30,6 +30,13 @@
 #include <errno.h>
 #include "native.h"
 #include "trace.h"
+#include "config.h"
+
+#ifdef SFCB_IX86
+#define SFCB_ASM(x) asm(x)
+#else
+#define SFCB_ASM(x)
+#endif
 
 int collectStat=0;
 unsigned long exFlags = 0;
@@ -393,7 +400,7 @@
    void *result = calloc(1, size);
    if (!result) {
       _SFCB_TRACE(1,("--- tool_mm_alloc error %u %d\n", size, currentProc))
-      asm("int $3");
+      SFCB_ASM("int $3");
       abort();
    }
    __ALLOC_ERROR(!result);
@@ -411,7 +418,7 @@
    void *result = calloc(1, size);
    if (!result) {
       _SFCB_TRACE(1,("--- memAlloc %u %d\n", size, currentProc))
-      asm("int $3");
+      SFCB_ASM("int $3");
       abort();
    }
    __ALLOC_ERROR(!result);

Index: sqlStatement.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/sqlStatement.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sqlStatement.c	3 Jun 2005 10:31:57 -0000	1.1
+++ sqlStatement.c	13 Jul 2005 14:26:02 -0000	1.2
@@ -7,12 +7,18 @@
 
 #include "objectImpl.h"
 #include "cmpimacs.h"
-
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>
 #include <malloc.h>
 
+#ifdef SFCB_IX86
+#define SFCB_ASM(x) asm(x)
+#else
+#define SFCB_ASM(x)
+#endif
+
 #define SbS sbs = (SubSelect*)this->cnode; sbs
 #define FS fs = (FullSelect*)this->cnode; fs
 
@@ -538,7 +544,7 @@
    }
    printf("%s(%d): invalid data type %d %x\n", __FILE__, __LINE__, (int) type,
           (int) type);
-   asm("int $3");
+   SFCB_ASM("int $3");
    abort();
    return "*??*";
 }
@@ -591,7 +597,7 @@
    }
    printf("%s(%d): invalid data type %d %x\n", __FILE__, __LINE__, (int) type,
           (int) type);
-   asm("int $3");
+   SFCB_ASM("int $3");
    abort();
    return "*??*";
 }

Index: objectImpl.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/objectImpl.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- objectImpl.c	13 Jun 2005 23:37:31 -0000	1.8
+++ objectImpl.c	13 Jul 2005 14:26:02 -0000	1.9
@@ -28,6 +28,13 @@
 #include "array.h"
 #include "utilft.h"
 #include "trace.h" 
+#include "config.h"
+
+#ifdef SFCB_IX86
+#define SFCB_ASM(x) asm(x)
+#else
+#define SFCB_ASM(x)
+#endif
 
 //#define DEB(x) x
 #define DEB(x) 
@@ -2180,7 +2187,7 @@
 int main()
 {
    int val = 37, s;
-   //  asm("int $3");
+   //  SFCB_ASM("int $3");
    {
       CMPIObjectPath *cop = NewCMPIObjectPath("root", "myClass", NULL);
       CMPIInstance *inst = NewCMPIInstance(cop, NULL);

Index: providerMgr.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/providerMgr.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- providerMgr.c	13 Jun 2005 23:37:31 -0000	1.12
+++ providerMgr.c	13 Jul 2005 14:26:02 -0000	1.13
@@ -36,6 +36,13 @@
 #include "trace.h"
 #include "queryOperation.h"
 #include "selectexp.h"
+#include "config.h"
+
+#ifdef SFCB_IX86
+#define SFCB_ASM(x) asm(x)
+#else
+#define SFCB_ASM(x)
+#endif
 
 
 extern CMPIBroker *Broker;
@@ -903,7 +910,7 @@
       rc=spSendReq(&ctx->provA.socket, &resultSockets.send, buf, l);
       if (rc==-2) {
          mlogf(M_ERROR,M_SHOW,"--- need to reload provider ??\n");
-         asm("int $3");
+         SFCB_ASM("int $3");
    //      reloadProviderRequest(ctx);
          exit(3);
       }

[Sblim-commit] sfcb Makefile.am,1.26,1.27

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

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

Modified Files:
	Makefile.am 
Log Message:
Removed non-existent regressionTests directory from EXTRA_DIST.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/sblim/sfcb/Makefile.am,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- Makefile.am	13 Jun 2005 12:50:33 -0000	1.26
+++ Makefile.am	13 Jul 2005 08:41:22 -0000	1.27
@@ -203,7 +203,7 @@
 EXTRA_DIST=sfcb.cfg.pre.in sfcb.spec sfcbrepos.sh.in sfcbstage.sh.in \
 	sfcbunstage.sh.in sfcb.init-redhat.in sfcb.init-suse.in \
 	sfcb.init-none.in \
-	regressionTests doc
+	doc
 
 sfcbconf_DATA=sfcb.cfg
 

[Sblim-commit] sfcb instance.c,1.9,1.10

[Adrian S. <a3s...@us...>]

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

Modified Files:
	instance.c 
Log Message:
correction to fix for 1229418


Index: instance.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/instance.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- instance.c	8 Jul 2005 22:19:50 -0000	1.9
+++ instance.c	12 Jul 2005 22:46:55 -0000	1.10
@@ -237,9 +237,7 @@
           data.state=CMPI_nullValue;
       }
       data.type=CMPI_dateTime;
-      }
-
-} else if (type == CMPI_sint64 || type == CMPI_uint64 || type == CMPI_real64) {
+   } else if (type == CMPI_sint64 || type == CMPI_uint64 || type == CMPI_real64) {
       data.value = *value;
    }  else {
       data.value.Int = value->Int;

[Sblim-commit] cmpi-base ChangeLog,1.11,1.12 NEWS,1.7,1.8 configure.ac,1.8,1.9 provider-register.sh,1.8,1.9 sblim-cmpi-base.spec.in,1.6,1.7

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

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

Modified Files:
	ChangeLog NEWS configure.ac provider-register.sh 
	sblim-cmpi-base.spec.in 
Log Message:
Bugs fixed: 1236584. Mostly enhanced compatibility with tog-pegasus RPM.


Index: sblim-cmpi-base.spec.in
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/sblim-cmpi-base.spec.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sblim-cmpi-base.spec.in	28 Apr 2005 12:36:48 -0000	1.6
+++ sblim-cmpi-base.spec.in	12 Jul 2005 13:06:55 -0000	1.7
@@ -4,19 +4,21 @@
 # Package spec for @PACKAGE@
 #
 
+# for TOG Pegasus invoke with rpmbuild --define 'tog_pegasus 1'
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
 
 Summary: Sample CMPI Provider
 Name: @PACKAGE_TARNAME@
 Version: @PACKAGE_VERSION@
-Release: 1
+Release: %{?tog_pegasus:tog_pegasus}%{!?tog_pegasus:1}
 Group: Systems Management/Base
 License: Common Public License 1.0
 
 Source0: http://prdownloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
 
 BuildRequires: cmpi-devel
-Requires: cimserver
+Requires: %{?tog_pegasus:tog-pegasus}%{!?tog_pegasus:cimserver}
 
 %Description
 Standards Based Linux Instrumentation Base Providers
@@ -33,7 +35,7 @@
 Summary: SBLIM Base Instrumentation Testcase Files
 Group: Systems Management/Base
 Requires: %{name} = %{version}
-Requires: sblim-wbemcli
+Requires: sblim-testsuite
 
 %Description test
 SBLIM Base Provider Testcase Files for the SBLIM Testsuite
@@ -48,7 +50,8 @@
 
 %build
 
-%configure TESTSUITEDIR=%{_datadir}/sblim-testsuite
+%configure TESTSUITEDIR=%{_datadir}/sblim-testsuite \
+	%{?tog_pegasus:CIMSERVER=pegasus PROVIDERDIR=/opt/tog-pegasus/providers/lib}
 make
 
 %clean
@@ -72,6 +75,7 @@
 # remove unused libtool files
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*a
+rm -f $RPM_BUILD_ROOT/opt/tog-pegasus/providers/lib/*a
 
 %post
 # Register Schema and Provider - this is higly provider specific
@@ -84,14 +88,14 @@
 %define REGISTRATION %{_datadir}/%{name}/Linux_Base.registration
 %endif
 
-%{_datadir}/%{name}/provider-register.sh \
+%{_datadir}/%{name}/provider-register.sh %{?tog_pegasus:-t pegasus} \
 	-r %{REGISTRATION} -m %{SCHEMA} > /dev/null
 
 /sbin/ldconfig
 
 %preun
 
-%{_datadir}/%{name}/provider-register.sh -d \
+%{_datadir}/%{name}/provider-register.sh -d %{?tog_pegasus:-t pegasus} \
 	-r %{REGISTRATION} -m %{SCHEMA} > /dev/null
 
 %postun
@@ -103,8 +107,11 @@
 %{_datadir}/%{name}
 %{_datadir}/doc/%{name}-%{version}
 %{_libdir}/*.so*
+%if %{?tog_pegasus:0}%{!?tog_pegasus:1}
 %{_libdir}/cmpi/*.so*
-
+%else
+/opt/tog-pegasus/providers/lib/*.so*
+%endif
 
 %files devel
 

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/NEWS,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- NEWS	20 Jun 2005 08:54:36 -0000	1.7
+++ NEWS	12 Jul 2005 13:06:54 -0000	1.8
@@ -3,7 +3,7 @@
 
 Bugs Fixed:
 - 1222571 Fixed segmentation fault on long process command lines.
-
+- 1236584 Better support for the peculiarities of tog-pegasus
 
 Changes in 1.5.2
 ================

Index: configure.ac
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/configure.ac,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- configure.ac	7 Jun 2005 13:38:16 -0000	1.8
+++ configure.ac	12 Jul 2005 13:06:54 -0000	1.9
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(SBLIM BaseOS Providers Base, 1.5.2, sbl...@li...,sblim-cmpi-base)
+AC_INIT(SBLIM BaseOS Providers Base, 1.5.2a, sbl...@li...,sblim-cmpi-base)
 AC_CONFIG_SRCDIR([OSBase_Common.c])
 AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE

Index: provider-register.sh
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/provider-register.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- provider-register.sh	7 Jun 2005 13:12:42 -0000	1.8
+++ provider-register.sh	12 Jul 2005 13:06:54 -0000	1.9
@@ -16,6 +16,19 @@
 #               registration data for a variety of supported CIMOMs
 # ==================================================================
 
+function pegasus_repository()
+{
+    for p in /var/lib/pegasus /usr/local/var/lib/pegasus \
+	/var/local/lib/pegasus /var/opt/tog-pegasus $PEGASUS_HOME
+    do
+      if test -d $p/repository
+      then
+	  echo $p/$1
+	  return 0
+      fi
+    done
+    return 1
+}
 
 function pegasus_path()
 {
@@ -149,6 +162,13 @@
 	    echo "Error: cimmof not found" >&2
 	    return 1
 	fi
+	PEGASUSREPOSITORY=`pegasus_repository`
+	if test $? != 0
+	then
+	    echo "Error: pegasus repository not found" >&2
+	    return 1
+	fi
+	CIMMOF="$CIMMOF -R $PEGASUSREPOSITORY"
 	state=inactive
     fi
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ChangeLog	20 Jun 2005 08:54:36 -0000	1.11
+++ ChangeLog	12 Jul 2005 13:06:54 -0000	1.12
@@ -1,3 +1,17 @@
+2005-07-12    <mih...@dy...>
+
+	* provider-register.sh: 
+	Bug 1236584: Additional functionality to detect the location of
+	the pegasus repository (in well known places - sigh).
+
+	* sblim-cmpi-base.spec.in: 
+	Bug 1236584: Added RPM macro tog_pegasus to support the tog-pegasus
+	RPM (reluctantly).
+
+	* test/test-cmpi-base.sh: 
+	Bug 1236584: Allow invocation from arbitrary directories 
+	(by Mark Hamzy).
+
 2005-06-20    <mih...@dy...>
 
 	* OSBase_Common.c:

[Sblim-commit] cmpi-base/test test-cmpi-base.sh,1.4,1.5

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

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

Modified Files:
	test-cmpi-base.sh 
Log Message:
Bugs fixed: 1236584. Mostly enhanced compatibility with tog-pegasus RPM.


Index: test-cmpi-base.sh
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/test/test-cmpi-base.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- test-cmpi-base.sh	20 Apr 2005 11:34:57 -0000	1.4
+++ test-cmpi-base.sh	12 Jul 2005 13:06:55 -0000	1.5
@@ -1,7 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # test sblim-cmpi-base package
 
+SCRIPT_PATH=`dirname ${BASH_SOURCE}`
+
 #******************************************************************************#
 
 export SBLIM_TESTSUITE_RUN=1;
@@ -19,6 +21,6 @@
 
 while(($i<=$max))
 do
-  . run.sh ${CLASSNAMES[$i]} $1 $2 $3 $4 || exit 1;
+  . ${SCRIPT_PATH}/run.sh ${CLASSNAMES[$i]} $1 $2 $3 $4 || exit 1;
   i=$i+1;
 done

[Sblim-commit] cmpi-samples/autotools provider-register.sh,1.6,1.7

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

Update of /cvsroot/sblim/cmpi-samples/autotools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29250

Modified Files:
	provider-register.sh 
Log Message:
Bugs fixed: 1236584 Better support for tog-pegasus RPM install.


Index: provider-register.sh
===================================================================
RCS file: /cvsroot/sblim/cmpi-samples/autotools/provider-register.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- provider-register.sh	7 Jun 2005 13:17:59 -0000	1.6
+++ provider-register.sh	12 Jul 2005 13:05:37 -0000	1.7
@@ -16,6 +16,19 @@
 #               registration data for a variety of supported CIMOMs
 # ==================================================================
 
+function pegasus_repository()
+{
+    for p in /var/lib/pegasus /usr/local/var/lib/pegasus \
+	/var/local/lib/pegasus /var/opt/tog-pegasus $PEGASUS_HOME
+    do
+      if test -d $p/repository
+      then
+	  echo $p/$1
+	  return 0
+      fi
+    done
+    return 1
+}
 
 function pegasus_path()
 {
@@ -149,6 +162,13 @@
 	    echo "Error: cimmof not found" >&2
 	    return 1
 	fi
+	PEGASUSREPOSITORY=`pegasus_repository`
+	if test $? != 0
+	then
+	    echo "Error: pegasus repository not found" >&2
+	    return 1
+	fi
+	CIMMOF="$CIMMOF -R $PEGASUSREPOSITORY"
 	state=inactive
     fi
 

[Sblim-commit] ecute/Plugin/com/ibm/ecute/plugins/output/funcionality RSAModelCreator.java,1.14,1.15

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

Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/plugins/output/funcionality
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19429/Plugin/com/ibm/ecute/plugins/output/funcionality

Modified Files:
	RSAModelCreator.java 
Log Message:


Index: RSAModelCreator.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/plugins/output/funcionality/RSAModelCreator.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- RSAModelCreator.java	7 Jul 2005 15:42:48 -0000	1.14
+++ RSAModelCreator.java	11 Jul 2005 07:29:19 -0000	1.15
@@ -212,32 +212,33 @@
 
             } 
 
-        } else {
-            //if there is a root association checks if the role names are not
-            // overwritten
-            if (lastRootClass != null) {
-                AssociationClass rootAssoc;
-                if(lastRootClass instanceof AssociationClass){
-                    rootAssoc = (AssociationClass) lastRootClass;
- 	                Property rootAssocProp1 = (Property) rootAssoc.getOwnedEnds().get(0);
-	                String rootAssocPropName1 = rootAssocProp1.getName();
-	
-	                Property rootAssocProp2 = (Property) rootAssoc.getOwnedEnds().get(1);
-	                String rootAssocPropName2 = rootAssocProp2.getName();
-	
-	                if ((!rootAssocPropName1.equalsIgnoreCase(roleName1))
-	                        || (!rootAssocPropName2.equalsIgnoreCase(roleName2))){
-	                    if ((rootAssocPropName1.equalsIgnoreCase(roleName2))
-	                            && (rootAssocPropName2.equalsIgnoreCase(roleName1))) {
-	                        String temp = className2;
-	                        className2 = className1;
-	                        className1 = temp;
-	                    } else
-	                        return OVERWRITTEN;
-	                }
-                }
-            }
-        }
+        } 
+//        else {
+//            //if there is a root association checks if the role names are not
+//            // overwritten
+//            if (lastRootClass != null) {
+//                AssociationClass rootAssoc;
+//                if(lastRootClass instanceof AssociationClass){
+//                    rootAssoc = (AssociationClass) lastRootClass;
+// 	                Property rootAssocProp1 = (Property) rootAssoc.getOwnedEnds().get(0);
+//	                String rootAssocPropName1 = rootAssocProp1.getName();
+//	
+//	                Property rootAssocProp2 = (Property) rootAssoc.getOwnedEnds().get(1);
+//	                String rootAssocPropName2 = rootAssocProp2.getName();
+//	
+//	                if ((!rootAssocPropName1.equalsIgnoreCase(roleName1))
+//	                        || (!rootAssocPropName2.equalsIgnoreCase(roleName2))){
+//	                    if ((rootAssocPropName1.equalsIgnoreCase(roleName2))
+//	                            && (rootAssocPropName2.equalsIgnoreCase(roleName1))) {
+//	                        String temp = className2;
+//	                        className2 = className1;
+//	                        className1 = temp;
+//	                    } else
+//	                        return OVERWRITTEN;
+//	                }
+//                }
+//            }
+//        }
         
         if ((className1 == null) || (className2 == null))
 			return NOLINKS;
@@ -260,22 +261,22 @@
 
         //as Qualifier Aggregate "is toSubClass" check if there are roles with the same name
         //and take over the Aggregation Kind
-        if(lastRootClass != null && lastRootClass instanceof AssociationClass){
-	        Property superProp = ((AssociationClass)lastRootClass).getOwnedEnd(roleName1);
-	        if(superProp!=null){
-	            if(superProp.getAggregation().getValue() == AggregationKind.SHARED)
-	                assocProp1.setAggregation(AggregationKind.SHARED_LITERAL);
-	            else if(superProp.getAggregation().getValue() == AggregationKind.COMPOSITE)
-	                assocProp1.setAggregation(AggregationKind.COMPOSITE_LITERAL);
-	            //Qualifier Min and Max and Key are also "toSubClass"
-	            assocProp1.setLowerBound(superProp.getLower());
-	            assocProp1.setUpperBound(superProp.getUpper());
-	            
-	            if(superProp.isApplied(superProp.getApplicableStereotype("CIM::Key"))){
-	               assocProp1.apply(superProp.getApplicableStereotype("CIM::Key"));
-	            }
-	        }
-        }
+//        if(lastRootClass != null && lastRootClass instanceof AssociationClass){
+//	        Property superProp = ((AssociationClass)lastRootClass).getOwnedEnd(roleName1);
+//	        if(superProp!=null){
+//	            if(superProp.getAggregation().getValue() == AggregationKind.SHARED)
+//	                assocProp1.setAggregation(AggregationKind.SHARED_LITERAL);
+//	            else if(superProp.getAggregation().getValue() == AggregationKind.COMPOSITE)
+//	                assocProp1.setAggregation(AggregationKind.COMPOSITE_LITERAL);
+//	            //Qualifier Min and Max and Key are also "toSubClass"
+//	            assocProp1.setLowerBound(superProp.getLower());
+//	            assocProp1.setUpperBound(superProp.getUpper());
+//	            
+//	            if(superProp.isApplied(superProp.getApplicableStereotype("CIM::Key"))){
+//	               assocProp1.apply(superProp.getApplicableStereotype("CIM::Key"));
+//	            }
+//	        }
+//        }
         
         lastAssocProp1 = assocProp1;
 
@@ -288,23 +289,23 @@
         
         //as Qualifier Aggregate is "toSubClass" check if there are roles with the same name 
         //and take over the Aggregation Kind
-        if(lastRootClass != null && lastRootClass instanceof AssociationClass){
-	        Property superProp = ((AssociationClass)lastRootClass).getOwnedEnd(roleName2);
-	        if(superProp!=null){
-	            if(superProp.getAggregation().getValue() == AggregationKind.SHARED)
-	                assocProp2.setAggregation(AggregationKind.SHARED_LITERAL);
-	            else if(superProp.getAggregation().getValue() == AggregationKind.COMPOSITE)
-	                assocProp2.setAggregation(AggregationKind.COMPOSITE_LITERAL);
-	            //Qualifier Min and Max are also "toSubClass"
-	            assocProp2.setLowerBound(superProp.getLower());
-	            assocProp2.setUpperBound(superProp.getUpper());
-	            
-	            if(superProp.isApplied(superProp.getApplicableStereotype("CIM::Key"))){
-		               assocProp2.apply(superProp.getApplicableStereotype("CIM::Key"));
-		        }
-	            
-	        }
-        }
+//        if(lastRootClass != null && lastRootClass instanceof AssociationClass){
+//	        Property superProp = ((AssociationClass)lastRootClass).getOwnedEnd(roleName2);
+//	        if(superProp!=null){
+//	            if(superProp.getAggregation().getValue() == AggregationKind.SHARED)
+//	                assocProp2.setAggregation(AggregationKind.SHARED_LITERAL);
+//	            else if(superProp.getAggregation().getValue() == AggregationKind.COMPOSITE)
+//	                assocProp2.setAggregation(AggregationKind.COMPOSITE_LITERAL);
+//	            //Qualifier Min and Max are also "toSubClass"
+//	            assocProp2.setLowerBound(superProp.getLower());
+//	            assocProp2.setUpperBound(superProp.getUpper());
+//	            
+//	            if(superProp.isApplied(superProp.getApplicableStereotype("CIM::Key"))){
+//		               assocProp2.apply(superProp.getApplicableStereotype("CIM::Key"));
+//		        }
+//	            
+//	        }
+//        }
         
         lastAssocProp2 = assocProp2;
         

[Sblim-commit] ecute/Plugin/com/ibm/ecute/rsa/ui/internal/wizards/command RSAOutputOperation.java,1.5,1.6

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

Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/ui/internal/wizards/command
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19429/Plugin/com/ibm/ecute/rsa/ui/internal/wizards/command

Modified Files:
	RSAOutputOperation.java 
Log Message:


Index: RSAOutputOperation.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/ui/internal/wizards/command/RSAOutputOperation.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- RSAOutputOperation.java	7 Jul 2005 15:42:50 -0000	1.5
+++ RSAOutputOperation.java	11 Jul 2005 07:29:20 -0000	1.6
@@ -133,8 +133,8 @@
             // FLAVORS
             log.setSubTask("Applying flavors...");
 
-	        //FlavorsHelper flavorsHelper = new FlavorsHelper(uml2Model);
-	        //flavorsHelper.setModelFlavors();
+	        FlavorsHelper flavorsHelper = new FlavorsHelper(uml2Model);
+	        flavorsHelper.setModelFlavors();
 
 //	        FlavorsHelper flavorsHelper = new FlavorsHelper(uml2Model);
 //	        Package package_ = (Package)uml2Model.getOwnedMember("Cisco_LogicalPhysicalCore");

[Sblim-commit] sfcb instance.c,1.8,1.9

[yeechan <ibm...@us...>]

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

Modified Files:
	instance.c 
Log Message:
defect# 1229418


Index: instance.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/instance.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- instance.c	30 Jun 2005 11:36:08 -0000	1.8
+++ instance.c	8 Jul 2005 22:19:50 -0000	1.9
@@ -230,14 +230,16 @@
 	 data.state=CMPI_nullValue;
       }
    } else if (type == CMPI_dateTime) {
-      if (value && value->dateTime) {
-	 /* VM: is this OK or do we need a __new copy */
-         data.value.dateTime = value->dateTime;
-      } else {
-	 data.value.dateTime=NULL;
-	 data.state=CMPI_nullValue;
+      if (value && value->dateTime && value->dateTime->hdl)
+         data.value.dateTime = (char *) value->dateTime->hdl;
+      else {
+          data.value.dateTime=NULL;
+          data.state=CMPI_nullValue;
       }
-   } else if (type == CMPI_sint64 || type == CMPI_uint64 || type == CMPI_real64) {
+      data.type=CMPI_dateTime;
+      }
+
+} else if (type == CMPI_sint64 || type == CMPI_uint64 || type == CMPI_real64) {
       data.value = *value;
    }  else {
       data.value.Int = value->Int;

[Sblim-commit] sfcb datetime.c,1.2,1.3

[yeechan <ibm...@us...>]

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

Modified Files:
	datetime.c 
Log Message:
defect#1230023



Index: datetime.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/datetime.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- datetime.c	17 May 2005 23:36:14 -0000	1.2
+++ datetime.c	8 Jul 2005 22:15:29 -0000	1.3
@@ -315,9 +315,21 @@
 CMPIDateTime *native_new_CMPIDateTime_fromChars(const char *string,
                                                 CMPIStatus * rc)
 {
+     
    CMPIUint64 msecs,secs;
-   CMPIBoolean interval = (string[21] == ':');
-   char *str = strdup(string);
+   CMPIBoolean interval;
+
+   if (string == NULL)
+    {
+         if (rc)
+            CMSetStatus(rc, CMPI_RC_ERR_INVALID_PARAMETER);
+         return;
+    }
+
+
+char *str = strdup(string);
+interval = (str[21] == ':');
+
   
 // 0000000000111111111122222  
 // 0123456789012345678901234